diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-07-31 02:18:14 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-31 02:18:14 +0000 |
commit | e65c9f583b7401f87fdccb6fcf4942f082a79659 (patch) | |
tree | 7ca1b714cac16bbbba58ffeb39186dd51196ef6e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | ea9b063ab4d677e293ca4a46d5bf166215693787 (diff) | |
parent | b5eba64c2e534964d9bc02cf3066ec929986635b (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 9bf0c45e6d -s ours am: b5eba64c2e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433532
Change-Id: Idef2792bcfa36a5b00954b8216d4a648e2183694
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions