diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-05 21:00:17 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-05 21:00:17 +0000 |
commit | 2acf4490cad16a8b9035e161b711717b170e5e30 (patch) | |
tree | 6965d2a55363a5a0fdece450148280a5c407a0c1 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | a4da0a546f7bee4eab8b0707dd739523e9933f3f (diff) | |
parent | 9348f972023d239035c9c021d230d44dddb5c442 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: dc862269a7 -s ours am: 9348f97202 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12079852
Change-Id: I6c8dc6a73a53613e44725af2444989f814546f01
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions