diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-15 17:35:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-15 17:35:19 +0000 |
| commit | 2bbb76345b4d402e33c7a7bf57827369284d4eab (patch) | |
| tree | e72e859606df4d9e31b25140675c784b7caf0801 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 1b03bdebb63013f78c8e80a46179c03345709d2b (diff) | |
| parent | 4f15fb7f4ccb8870e3bf18a33886ad783a5cedb4 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 218b61acf4 -s ours am: 7b142fb0e4 -s ours am: 505574f6ea -s ours am: 4f15fb7f4c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12156601
Change-Id: I273da4598b350e3fdf345a6573929cc03c83ab0b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions