diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-09 19:54:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-09 19:54:52 +0000 |
| commit | fa876b86a55155144cce87343d64a80a9cd6665f (patch) | |
| tree | 326966927d87926227a94fcd6c7690d395f124fe /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 4fbe4f4ab422b0dcdf567032110b889cbfc83d0b (diff) | |
| parent | 235d92ebfd737e5438a5ed572d10eae83ea66240 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 0811c47412 -s ours am: 34d81efcdd -s ours am: 1adfcb6adc -s ours am: 235d92ebfd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12118648
Change-Id: I64e2d7f317ad95878fb0697fe0a4c28d767a871e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions