diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-01 14:23:28 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-01 14:23:28 +0000 |
commit | 15bcbafcc1d5940b4acadf1a9bd2895d9ba607b2 (patch) | |
tree | b0e47a44e196b7c062aba710f82d42ca38fa3049 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 8b4d3faa211049e5b93683b46269e1656dce68d5 (diff) | |
parent | 90297740f471c81800d039367d664a8b59d76ad5 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 90297740f4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12053601
Change-Id: I71de6d5ffe640cb932238c2e05f6d1bd8f70a422
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions