diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-23 20:08:47 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 20:08:47 +0000 |
commit | d15c85b01250bfeae3326b830d44b4c764ed621a (patch) | |
tree | 6d530140945393fd75867ee40070386e27aa38e0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | abd291b49206c51c5006297717a66d04efb73cc1 (diff) | |
parent | 2feff4d390b548810a90a56745862da770f41051 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 06ba19ff4e -s ours am: c42930e1cf -s ours am: a4c785ac3d -s ours am: 2feff4d390 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11972643
Change-Id: Id6b836a2094d1d26071a478c4bd0eba5db801912
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions