diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-05 21:27:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-05 21:27:51 +0000 |
| commit | a8b2f1448a101a7c03f3b5246e8a7a2f24a4cfe1 (patch) | |
| tree | 3905411e667d2ff53356e06be0d975bfd0957e9d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e8b39cf2d55655f72e64e7f0c32de6bc503387eb (diff) | |
| parent | f75e86e3f1132046957c9c720586d61a63ec3207 (diff) | |
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 4aa476c0eb -s ours am: 4c3e8bbff9 -s ours am: 262fa1f937 -s ours" into rvc-d1-dev-plus-aosp am: f75e86e3f1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12079851
Change-Id: Icf895ba2f3e4510d8ffc3049f33d4cdddb5b2f03
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions