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