diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-05-02 11:19:10 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-02 11:19:10 +0000 |
commit | d522072f2e2cf73eb2ad645ab4cd48513e5f4df4 (patch) | |
tree | e344d7f4fc4d81134329ae88035841ee353aaf19 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 332ad74353b18933a03fdc9e6267e77b6583bdb1 (diff) | |
parent | 8f5ae02ce13650da82c39e4d511ab8febab73996 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: f357945196 -s ours am: 8f5ae02ce1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14404552
Change-Id: I203f7ac4e039e8f39b2bbf993f4b2809d9d343b7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions