diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-09 23:07:17 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-09 23:07:17 +0000 |
commit | 169207e9c23225af9c56676470132d9ce6396c74 (patch) | |
tree | 9e849e74a56ac25871682552799c6c5548da2eda /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | d28f566f6be8cf8e946240c9ad9b7544652f8a74 (diff) | |
parent | 4d36a1c2023b4a23bea4e00c3a5e03ee0fbb3a8c (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: cd259caf54 -s ours am: b7c2316423 -s ours am: 4d36a1c202 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11809238
Change-Id: I4c82cdb3bba03c5ea4805be90f3de3af9b9496f6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions