diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 16:48:06 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 16:48:06 +0000 |
commit | 75c3356103e97dc1ea30859dbfb82134b24f9dc0 (patch) | |
tree | 4b2e461a812aaa0292cf21bbd776231cb76553ac /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 5c201b03609bfd00d9ab8b3753ead6f38a6de7ef (diff) | |
parent | c83b93b3f148da29d52a4bb8347299a5e9bb7844 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: c83b93b3f1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12087182
Change-Id: Ibf676b0275f6509193eb947e6ee1b060dc0fd766
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions