diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-21 18:32:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-21 18:32:14 +0000 |
| commit | 1c2a52d161dbe81292167db756afea2197cda202 (patch) | |
| tree | c5591c8585bb5401e40c6b35a7896599ebd6bd7d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4f3636fdd6fbe348bec00ca36995ec8ec716ed52 (diff) | |
| parent | d8588f20c51d2999608a87f732d064dd26f16d7e (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 5b962929bf -s ours am: ed11a3ab23 -s ours am: 5e65c41e7d -s ours am: d8588f20c5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11937074
Change-Id: Id0615579cb7af376615289b4c98ea69dcb94cd56
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions