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