diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-03 01:45:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-03 01:45:11 +0000 |
| commit | a23e29dd54742a2f4690f1665b2f2c8571775831 (patch) | |
| tree | f314a575bd9e3adbc24c136ca817020299d2020c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6f6c141547c15d8c070af22134f706b80f35f240 (diff) | |
| parent | 3df8d0d16b46ae3e4c73d6b5d25118044746d36c (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12508890
Change-Id: Ie2fcfd651314367edb16ccf0319a798062d7ff32
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions