diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-03 02:34:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-03 02:34:47 +0000 |
| commit | 02a3f801f2fcf0bb5f8570bc5332aec3949f5bc1 (patch) | |
| tree | a790eef76984bd0e3aa7c73fefa9c9b4214eda78 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f52bdb9c834a72ba4df535d63938ba7813c5b616 (diff) | |
| parent | a23e29dd54742a2f4690f1665b2f2c8571775831 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: bb4b4bdc43 -s ours am: 5718baad64 -s ours am: 3df8d0d16b -s ours am: a23e29dd54 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12508890
Change-Id: Id02ca46250c3716d4e9a235e7d35761047407c46
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions