diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-03 07:23:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-03 07:23:38 +0000 |
| commit | ecc7743bfff8b943b198c83c5b206a2f610b6cf7 (patch) | |
| tree | 3a87da8c1b0e6643b38554e2577301a6b992995b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6893507af31b64d84af7cdad8d902da4a7ceddf1 (diff) | |
| parent | bd75f52a7bf41e658a3b5f4ebd48efe872445508 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: cc822e170a -s ours am: cd4a8cbf2e -s ours am: 02204628e5 -s ours am: bd75f52a7b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513073
Change-Id: I4cb27dd8da6345c03a2a1165f59ffbd03fb057e0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions