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