diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-23 20:07:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 20:07:27 +0000 |
| commit | 1cdd976729c7677eb2732285c2fddb66ce67dfbf (patch) | |
| tree | 6d530140945393fd75867ee40070386e27aa38e0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1e4f2072a09bdfe5aa1e8ce5a0a1b4b3d744a001 (diff) | |
| parent | 616d33358536a6b8ee083fdfc0ecacd3991eec66 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 06ba19ff4e -s ours am: c42930e1cf -s ours am: 2577945aa4 -s ours am: 616d333585 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11972643
Change-Id: I11cdaf7769e36cff4695adbfb4f5b0da4cc35089
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions