diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-12-03 17:59:37 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-03 17:59:37 +0000 |
commit | 3afa6ae7877f052f18b9b1d6629d1a6ce3db2f64 (patch) | |
tree | 5d1c33c6a0206c777115df5423c5f2be5158a091 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 505fe3a5c7f973b117f0904b0a725d441ce0ae52 (diff) | |
parent | 7c13fc86d1423706b5b279de4f9c0b091a443e27 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a4c9d532e0 -s ours am: 7c13fc86d1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13161917
Change-Id: I89ec5373e30ab57dd552498788d84b77c9d4ce1d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions