diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-11 19:33:56 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-11 19:33:56 +0000 |
commit | e049888bc40c31d52eb5054677017b2a51d80e9b (patch) | |
tree | a68de92a7b6d998dfbb74d1f0b1ef1ead0d8f878 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | f0c37e7ac88e51f977132c8456d6674211ceab64 (diff) | |
parent | 15f35772357e600bd1cc8f24b78627b1ebd4b55a (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7a33282392 -s ours am: 482997c563 -s ours am: 15f3577235 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12134821
Change-Id: If5f374382a4fee68f3120f464827663c33bc004b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions