diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-27 16:43:16 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-27 16:43:16 +0000 |
commit | d272b3739bd415f93a8d084b0b8d97075d9195b2 (patch) | |
tree | 0086bc7f9cfd7055094342ae341610753985d4a1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 0409e885163ba831faca720c96bc703e4fd381f4 (diff) | |
parent | 926962dee8678ee9551cbff7c1a5cff2c779911e (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 18eebd70b4 -s ours am: 926962dee8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12014703
Change-Id: Ie2501f89df9254c2683cdb0034a302966e5eee09
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions