diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-12 15:23:37 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-12 15:23:37 +0000 |
commit | 477c2b80d545154edd5a4dfd97091c044760ac38 (patch) | |
tree | e783e66afb06d9d40a4cb489bc477f489757bec1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 711d37f704ffc5aad336fbb7a515d0a552fbe20d (diff) | |
parent | 01438d20c0650a029e0293bcecb75f6699b44cd8 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 77e3cce083 -s ours am: 981cdf9ed6 -s ours am: 01438d20c0 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12136585
Change-Id: I5b44994884a698d4f1f11f04000bcfe8e90d044b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions