diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-22 15:01:46 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-22 15:01:46 +0000 |
commit | 5f131cde668f8361a3872216f22cbae0c73b5067 (patch) | |
tree | 28634386a64fcc8f1ee6cc4efcfdef2139ec86b3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 4b7401f9316735fe353bb49012035b65a75a745c (diff) | |
parent | d274706b8d87aeb07575b792d137fe3ed24ed260 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 30166a7e23 -s ours am: d274706b8d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12428382
Change-Id: Ie62efe6e88b4932a6955c63a0daf171ece6f722a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions