diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-03 09:00:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-03 09:00:42 +0000 |
| commit | 7a8f5068150528655bd0c9f3fbba344bf57a864d (patch) | |
| tree | d071c12d33cd7bd89ec76b00223e794b2b06c2c8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b4e08b8598d8717281292bfd8448677a2dc88486 (diff) | |
| parent | 9ba16c48070c51317b93f75e1a9f892429b5fa3a (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1051ed16e7 -s ours am: 252c0e7473 -s ours am: 9ba16c4807 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12516627
Change-Id: I89fddbe3ecc6361d1ebce841c9eeb63fc8bf02d3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions