diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-28 06:31:02 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-28 06:31:02 +0000 |
commit | 14f12f93262d473b5d04d59ec1899f6af867c6c9 (patch) | |
tree | 0086bc7f9cfd7055094342ae341610753985d4a1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 7167bc65325b3ae94242631c483a4a25cf702a29 (diff) | |
parent | 4e8823530e21ddb733f9082c569e30d56d7f7a97 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8d737ec862 -s ours am: 3a4179f7bf -s ours am: 4e8823530e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12014871
Change-Id: I13e270d2670ad7a1d6a0ac1583d42f2d6519844e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions