diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-22 18:52:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-22 18:52:01 +0000 |
| commit | 7645d47660720f3aa2b25a2277526533d67f7689 (patch) | |
| tree | c3b62533856c61711aeb3d5bde2183b587b2ff11 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4d1a47aa847d170c71d92305449e1d467daf2269 (diff) | |
| parent | 5519d32d4be33da0e1a79d1513eaa199ab0fcc3e (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ea6d47bd95 -s ours am: cd548ffab2 -s ours am: 5519d32d4b -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684627
Change-Id: Idd3f8ea3a73eba9763b1577741b3930ec5a3fee7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions