diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-24 18:22:28 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 18:22:28 +0000 |
commit | 5ae3087f8f6a97030ccc88df58df7155e2ee3c39 (patch) | |
tree | e43cbe9254723df5333191bf99e06816901c1a18 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | a5bc3c8db7d1a20b4e772dfade989484e604dab8 (diff) | |
parent | 296a06d4fbb89505a72d424ca5f2988d95a60e80 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 65baeccdd8 -s ours am: 296a06d4fb -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11980785
Change-Id: I333c664b81a898b49000eda5b6534d71d4a04544
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions