diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-14 06:18:14 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-14 06:18:14 +0000 |
commit | f8df072b25235166c3fa9ff837424ad17bfdd5de (patch) | |
tree | a9e0e5c34fc13bdb78058927ec24249545b8a06a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 25fa2774da3a78df692c1bc1f675581d9c20aee0 (diff) | |
parent | b4a887d904e6c60f70237ae079e3d503cc009804 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a9912b7e6b -s ours am: c70f8b5873 -s ours am: a92473a297 -s ours am: b4a887d904 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11860524
Change-Id: Ida96ae719653aa827c827bde62358e52a46eba01
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions