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