diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-23 18:56:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 18:56:11 +0000 |
| commit | db622adf3236444ef5ac0ffdd8402f38b633e50e (patch) | |
| tree | 93c73b4da8d78cd3f150cb8fc10befb4fb5aaa64 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 85f95ddd571e4db08bbab0b8278527318d06f5d9 (diff) | |
| parent | fb26dbe38916b7a65c3138a71bbf71f2b1aecfbc (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: f8c312b928 -s ours am: 89dc28eca4 -s ours am: 1ec65ac763 -s ours am: fb26dbe389 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11964771
Change-Id: I587b447026ff58223fc0196f20a13091f7b68fa0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions