diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-22 20:23:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-22 20:23:33 +0000 |
| commit | 843c4eecc35cba73f41f0be54f48b5fb6edfd540 (patch) | |
| tree | 87611a13927dbbd03ed3a6efe9f44700c433b172 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 40b26445f412ce663258681352d901200e63111c (diff) | |
| parent | 975541d9f0ea22fb55d175254bff67eef70d5cdc (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 7dbd97e972 -s ours am: 975541d9f0 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684418
Change-Id: I0e38349750ff4882412782fe3838ab1ffe5f7dad
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions