diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 05:28:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 05:28:26 +0000 |
| commit | efb5c312d49d8ac937838445f3e75143cf8f5c0f (patch) | |
| tree | bee7682b401932290b0a8affa3cc0dc1a12c099b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 932108123a9e051df3234eed80930261020b03bc (diff) | |
| parent | 6da5b0de3dc550ca4cddda865223fe4cb7ef1d03 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 61298b480c -s ours am: 6da5b0de3d -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420260
Change-Id: I005aa1100af3516ae6a9563fc541315c168672df
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions