diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-03 14:26:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-03 14:26:11 +0000 |
| commit | 15b6144bd46327b4ef9f21d52ea48ee3fcfa54b0 (patch) | |
| tree | 193322cdc5796fabe5af1f0a9f879a38297cbf9c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 5e5a4bbb858ad18c22c3e0781b6da89116aedc57 (diff) | |
| parent | 72c39c119d80e98fe7f8e9166a678ffe780cfdcd (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b13c90f3bb -s ours am: 8e375eccc7 -s ours am: cf28ca3c73 -s ours am: 72c39c119d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12518879
Change-Id: Ic5ef95194969f11ed2b20962da46234f4877ea4b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions