diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-14 06:17:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-14 06:17:54 +0000 |
| commit | 702828011222c823dd003c46056be95dc1a63b4c (patch) | |
| tree | a9e0e5c34fc13bdb78058927ec24249545b8a06a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 903f273e7d810a210063b7be1e0baf42fa596bba (diff) | |
| parent | 317f5a9810f5d35071cc3c420a366d431d837dac (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 96860e0ecc -s ours am: 41369c7d65 -s ours" into rvc-d1-dev-plus-aosp am: 888b803786 -s ours am: 317f5a9810 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11860341
Change-Id: I81b667356c4e34d0999195f5484fcaf7d47159dd
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions