diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-29 19:14:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-29 19:14:46 +0000 |
| commit | 10d69bfdce69c591140a81c66a2440f8095e65fa (patch) | |
| tree | 57ce96bd3425d53d3ba2de71f254b041d6ea959e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 40e37e117baff611b6a60a495c55061ad5011c20 (diff) | |
| parent | 22e2e8105141301630a978e661c7a349946f4d08 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b56d7a6e98 -s ours" into rvc-qpr-dev-plus-aosp am: 22e2e81051 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14020226
Change-Id: I01e0faf8bb511c398e158d52f1d8e219ecc61e70
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions