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