diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-14 06:00:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-14 06:00:38 +0000 |
| commit | 317f5a9810f5d35071cc3c420a366d431d837dac (patch) | |
| tree | 91811a0ae2fc41f1cfc7b3233c0b6e6906daf5e5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 228a8884d64c3e99b55fa98480ee4686297cfa0c (diff) | |
| parent | 888b803786f4891e4e625673cc8b736d1fff193c (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11860341
Change-Id: I17cf05f7fce836e4d85dfc9c9a3c00786cf7743e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions