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