diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-16 08:49:36 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-16 08:49:36 +0000 |
commit | cd2995cc7b1645d32836b646013d92207eaff1d4 (patch) | |
tree | 209d522f331adb96e4a2ac52e6fe5f7bcb6ed32f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 3c6c999e494328d6ca6f0e7ab9541407180ac3bc (diff) | |
parent | 29fbcaa14cc0b99070f1445cda8941adfe4862f5 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 345a4d331f -s ours am: 7ff2385623 -s ours am: 29fbcaa14c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12164903
Change-Id: If828c04c2e56326f0e6e00dc8cc4b22ee0f5c78a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions