diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-06 14:41:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-06 14:41:22 +0000 |
| commit | 9822e82c8768673ed215ece0e032a5f9b40324e9 (patch) | |
| tree | 5d2914bd3fcefe921818736883faa34dbcc7b566 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f898681fb77e2ceb7ebd2abb1cb18e976f7480e6 (diff) | |
| parent | 06aa194507e926e18c4a69f90aa2f84857f378a8 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c4c8e17c99 -s ours am: 17e5b6543e -s ours am: 3a1f81ed45 -s ours" into rvc-qpr-dev-plus-aosp am: 06aa194507 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11761986
Change-Id: I9d371860002988abdff25ae0c20de2f21632d116
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions