diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-02 18:10:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-02 18:10:15 +0000 |
| commit | b319c1ff21e5a2a7e6e000f3ae684519c09d278a (patch) | |
| tree | 5db9ae1906438971c6992ef795850542ab8ef969 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b428e8f992b858cc21ea8c012b32050a123ce160 (diff) | |
| parent | 55dde9a68376c99f6eb0ff324eb8d77ad52b5658 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b1f16b637e -s ours am: 372c5529d3 -s ours am: e8dfd91dbf -s ours am: 55dde9a683 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12508778
Change-Id: I3a1506c92fcd111eaa80659bc99a94f361c9c994
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions