diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-12 15:11:40 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-12 15:11:40 +0000 |
commit | 2064152f41b32390deebd4099c76c86a66558aaf (patch) | |
tree | 38a179826e87a9053155f6d5e8bc2f4ef10cedbd /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 7d0fbd312387896c864d4f1f2d5a80a00a092491 (diff) | |
parent | 78ce764482020d2ed00ce74c8ec21b2c511149f6 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: ca8a77ea51 -s ours am: c7901e9194 -s ours am: 78ce764482 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12136594
Change-Id: If9e6f28d319f8b7425a1924e4e176b5b84f9a2cc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions