diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-04 00:02:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-04 00:02:37 +0000 |
| commit | fdcadcd4d96a9eb493c93c2db5a8efb50aa35769 (patch) | |
| tree | 3905411e667d2ff53356e06be0d975bfd0957e9d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ab5e496cb6750d2b7d1cea7eb1b18dd8a6b1737f (diff) | |
| parent | 4d96a3d8bc8a3b138b0daf89b51b8bcf02c3b356 (diff) | |
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 52853711c6 -s ours am: 6101c0fc0f -s ours" into rvc-d1-dev-plus-aosp am: 4d96a3d8bc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12077345
Change-Id: I680bb7baf4a2c429daf5ecbd95cbab24b62f39ae
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions