diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-13 18:51:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-13 18:51:08 +0000 |
| commit | 57805e14b83d342ebe31739b4df2655c95aaea44 (patch) | |
| tree | fd1fb1f2780ac4af30d9df76545b5fcac4804b36 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | c8f4ca2a746b05120eb0b7e6566b99e37186a9c0 (diff) | |
| parent | fa811843fec84fdeee8ebd8e626673f1814c0ab1 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 9ca5de2464 -s ours am: fa811843fe -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14171949
Change-Id: I01dedb5072545c36679273b62a3fd6377f64f4ab
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions