diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-21 18:21:13 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-21 18:21:13 +0000 |
commit | ca908107479287892b9e8b6ed7a81b74e8dbaa3d (patch) | |
tree | 58fbabf65039e97889bc8fb11492019a3e8a696f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 49a6a40798dd1e769db9f47fd8a2a747f1419c47 (diff) | |
parent | 29ff1de466ab990ec11b9b137e98cc1ea72dfbaf (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 38991cd74f -s ours am: 279976c789 -s ours am: 29ff1de466 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11937073
Change-Id: I1234f80f7b6214167d1e3939600db47b65f1fa0e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions