diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-22 19:11:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-22 19:11:02 +0000 |
| commit | 9cc37c9c2a1339f24f071ddb8b5a486c0de4ae33 (patch) | |
| tree | ce7f4ef12224ad878f43cfe81858d66c70b2e5e6 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 9cc9dfb807a89670235221d731bee03c34ed0c8c (diff) | |
| parent | 4152a1944e4bc9cd066542653fd77a708e7ab939 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4152a1944e -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684931
Change-Id: Ic15f0c4de2dd6c5f987ba106b5c04049adc877ed
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions