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