diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2021-02-18 07:20:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-18 07:20:12 +0000 |
| commit | 667d618421d4af3dfa4eb6537e5c411ba8d4246a (patch) | |
| tree | 83de7f4a6a0c0ff54f630045f8c2d3e59d00f95c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 488a3356d4fe7005cf18543c6fdceb914a2228b2 (diff) | |
| parent | ea256c68e2b14fd7237d4ca39c2d4d7b163a0225 (diff) | |
Merge "Fix merge conflict." am: 187a9a085a am: ea256c68e2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1592111
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7d070661be72383036f1b16a0c2396840c7e7475
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions