diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-12-11 10:53:51 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-11 10:53:51 +0000 |
commit | ade62a72f819de3427a5a8e93a34943ac6c5341c (patch) | |
tree | 92d049bd65336e7bdb528342554020880002c390 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 7dc46c2967e330f89a8d1cb7d79ebb37dc5962a5 (diff) | |
parent | 9a965222443ba173dce78ef1b39e07e0c1114846 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 2ca34ba0a3 -s ours am: 9a96522244 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13200343
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idcce1810aa357a1bd01c7efc1c16d6af86fb1d1f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions