diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-11-23 16:15:16 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-23 16:15:16 +0000 |
commit | cb36763335a2241ed7fedd88ba91afc6c9575300 (patch) | |
tree | 229096dcde391cc1d11bf12f81a784d923e66b31 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | f2d00fbac668445f2af19d3bfecfb902dff2e804 (diff) | |
parent | 1f834f5a5d9a051a5848fce17ce764722fedd5e4 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 94260edc80 -s ours am: 1f834f5a5d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13108240
Change-Id: Ia884147bf4aacb238ad07896328029dac70cb946
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions