diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-24 18:22:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 18:22:36 +0000 |
| commit | 5894a726c8b9550f85f845f5a4248dce2823f179 (patch) | |
| tree | e43cbe9254723df5333191bf99e06816901c1a18 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 5ae3087f8f6a97030ccc88df58df7155e2ee3c39 (diff) | |
| parent | a2d39223f35887e9754b924c1bdfb1404091ae40 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 65baeccdd8 -s ours am: a2d39223f3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11980785
Change-Id: I83d6b03602bed4fe03c25ce61a92c1c860d4e049
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions