diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-27 05:29:41 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-27 05:29:41 +0000 |
commit | 6233f7385682af7a23a6200095051a398196984f (patch) | |
tree | 3acce7826a9b6b53415e861ca802da9758c910fa /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 2209f28e2e7e960dfb942e82d271115ecf4ca5da (diff) | |
parent | 715ab549b75832df0734fd303b51e1150a9966b8 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 24a44a462a -s ours am: 715ab549b7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12013411
Change-Id: I140e832bfb623fe86ca6e85d9986498f8012b27a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions