diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-14 06:16:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-14 06:16:31 +0000 |
| commit | 6a6cefcd0ceb7b2cf3fc3b055052c067e6a8b53f (patch) | |
| tree | a9e0e5c34fc13bdb78058927ec24249545b8a06a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1d759eb842af0da5e0c97d4092e4d31f634629c9 (diff) | |
| parent | f44efc812982a272b56700de0160a80d0a1739d2 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 96860e0ecc -s ours am: 40e01bebc0 -s ours am: 2c2d86ce66 -s ours" into rvc-qpr-dev-plus-aosp am: f44efc8129 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11860341
Change-Id: I700c2cbe975e2be8168b6ed2111cb15ce9772bae
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions