diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-09 21:17:01 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-09 21:17:01 +0000 |
commit | 6ced9cfac24659494f6806ddbc8f5c592d15fa86 (patch) | |
tree | 68167c8610f97e8658c28e55f9f5b1979d10d75d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 9e7e1a570ea1b18144f8c08d9e9060c3acbbe114 (diff) | |
parent | 5e543d378a2248b81d318832df3c62e61f90b212 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 32075475df -s ours am: 5e543d378a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14140197
Change-Id: I315a004e768cfad9a347cd3cee8a2c171d0809a3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions