diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-19 19:52:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-19 19:52:23 +0000 |
| commit | 0a2581f82789085ad2fc291d83fd34cd1f61824b (patch) | |
| tree | 09b5e899e63f98928b1de4da01c063fc335f7996 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1efc890cac24ca545e23efbb226614004202d596 (diff) | |
| parent | 792511717e6732d9bd1ccef1ddd70e902407efe6 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: c294687770 -s ours am: fdd9fab0be -s ours am: b936f13c73 -s ours am: 792511717e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12188942
Change-Id: I53ad2a268d5e62dbb9a0f83ecc773408b0de2db2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions