diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-21 20:26:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-21 20:26:42 +0000 |
| commit | 4855cdd6a49c1ca38f45ec425bfc12fed20114af (patch) | |
| tree | 0ca29050c695c71f21b0ba3146bb36958d7ae713 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d697debafbd49e5eee88d6910887874bc1d53ee3 (diff) | |
| parent | 0d7fa3c08fe09a89f6fc742f80ca92c68b51e584 (diff) | |
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2414b21d4e -s ours am: 5bef533f30 -s ours" into rvc-d1-dev-plus-aosp am: 87cfefce3e -s ours am: 0d7fa3c08f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12198205
Change-Id: I5c3e7d8e16324ab0003419c93396ffffae77c52a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions