diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-10-05 15:58:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-05 15:58:23 +0000 |
| commit | 22147f938951c8d6fdee9f0e1a3e2ccce3f4ab5b (patch) | |
| tree | e29a0426f2696ef3bbde57060daa0e1cef195d31 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a868ad560117ea0d6f8e28b48083fedc5751b936 (diff) | |
| parent | 3285bce8c2f21bd0099b3bbd34d63eca1890500d (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: ea299cb860 -s ours am: 126049588f -s ours am: b5d5d0d99c -s ours am: 3285bce8c2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12762766
Change-Id: I297de1973428716a40b5fd292027e579762a04fa
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions