diff options
| author | Sarah Chin <sarahchin@google.com> | 2020-07-23 21:15:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-23 21:15:53 +0000 |
| commit | 0e61f17f188797c5dc84cb5dd4f2e8548a4ca472 (patch) | |
| tree | 31571ad83547e3fdbf889c36ace7d13bafe6c0cf /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ed838c12c2d49ecc3830107df2cc18e92c12e993 (diff) | |
| parent | f55ba6d67fd76d338de0485551b48e9d8bca6853 (diff) | |
[automerger skipped] Merge changes from topic "phone_info_5g" am: 20c0cd6b4c am: 0cb19b5ea5 am: 8683d3daa5 -s ours am: f0dd086772 -s ours am: f55ba6d67f -s ours
am skip reason: Change-Id Ie709cad1c94ad204c46a559d316f45da16c3541c with SHA-1 33e5841e87 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371137
Change-Id: I5c305a30ff6bbc5b2b3426d1ff647f9cdd61c138
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions