diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-11-23 16:15:40 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-23 16:15:40 +0000 |
commit | 48cece06830653557fb8164c93754aa06cd1f9ed (patch) | |
tree | 229096dcde391cc1d11bf12f81a784d923e66b31 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | cb36763335a2241ed7fedd88ba91afc6c9575300 (diff) | |
parent | 1b9d4f3293ff6feaf484baa889d4b5b78532c088 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9ee39d479b -s ours am: 1b9d4f3293 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13108644
Change-Id: I80e3871f430a7e05764ea7868686d1f544d61f50
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions