diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-03 11:40:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-03 11:40:15 +0000 |
| commit | 9f56f54fe304cfca204fbf2406b2da5a30ddf938 (patch) | |
| tree | 6bc1d197a89b4fc8733f35a0d78a7dde37e37be7 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 0ed554de4dc06c75c52b1980aa4a4cdf38ae0bba (diff) | |
| parent | 27955484a4345770e0a9bd1c422fb86e3bd43d3e (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: e941db9ff2 -s ours am: 2879daa6aa -s ours am: e4321e7359 -s ours am: 27955484a4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513076
Change-Id: I5fec8ca744b967d7f17009433193adacb9a5c288
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions