diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-03 16:11:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-03 16:11:54 +0000 |
| commit | c418cfe3955f2f7512f302137e6ddb1e7203580b (patch) | |
| tree | 57be1ad2940bea96cc0aedc52258b0a8e20f4c6e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 9e6cd27e8d730376156995235f1543154de73f56 (diff) | |
| parent | 001d184b536e3ad6b48c9e9270337c82fe548cf0 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 94fbf790d7 -s ours am: e177a3da93 -s ours am: 001d184b53 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515250
Change-Id: Ifc747069b8f3a643bec3b9035eb9545d11b4379b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions