diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-17 17:05:57 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-17 17:05:57 +0000 |
commit | ea2b3650f36e9008b409d193b01411f17b3cdbcc (patch) | |
tree | 24f642b5fcf9628c5cd1e2a5fcc9d9bfd00a2eaa /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 2b077e746ac32effdfe025ba6deb7dff35ca90b3 (diff) | |
parent | 9ec9aeaf5fc88a6ec519343a7b6908486cea667c (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 0d4e9ecbc0 -s ours am: d26c3be9e7 -s ours am: 9ec9aeaf5f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11887442
Change-Id: I50f646af5f24d60d3ae200551c97aabe8168b27d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions