diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-07-21 13:41:22 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-21 13:41:22 +0000 |
commit | 9118bfc2fb17b8471006e6ed3776c246b4b5d34e (patch) | |
tree | 7db7024e28f60211e9c4283c662379507f403892 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 78ea856c420501c920718c784ca43b646bfd6742 (diff) | |
parent | 4d7a460996017eb2edd03e8957215f7f5a5d619c (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 39bd3b0f40 -s ours am: 4d7a460996 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340842
Change-Id: I7519602542fa70cf8b965c6bd898e0abae2f2efb
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions