diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-19 19:14:27 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-19 19:14:27 +0000 |
commit | b936f13c73b22365685cc160fd8410624edecee2 (patch) | |
tree | 658c3672e8eccc8398ca181b5ac80ef3e3bea21a /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | fdb56d01b5c776f8e18eac062f1fcf4e01eee5b0 (diff) | |
parent | fdd9fab0bedf7bfb01ffa10ca567f7fd03692adf (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: c294687770 -s ours am: fdd9fab0be -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12188942
Change-Id: I32a76f9fa31a3fc08a8b69595f9580a91f3b2596
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions