diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-21 18:09:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-21 18:09:40 +0000 |
| commit | 593fea3e9072ace82f754f701ca3ca171fd3bb24 (patch) | |
| tree | fb028513def85670d7a39673f116a83d26588f41 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 8d62c50d89e4d85e5ae5247edd509e6167c0c6c2 (diff) | |
| parent | a5b5196ca2853001a96ae594c4655fd6dacf4d33 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 38991cd74f -s ours am: a5b5196ca2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11937073
Change-Id: I4a222500ad97dcddc11a78d7ac1b3e869684a590
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions