diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-24 21:20:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 21:20:56 +0000 |
| commit | f77990c1fe6a71c6d4ccf67e8780225fba07d7bb (patch) | |
| tree | 73034d87dd16128525138a4b0cb05ea972b6bddb /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 775eb82ccff6bf226f0c14317df290259086444e (diff) | |
| parent | eae2b4dbfb9424f5b542a6cf8abef4cd27234f38 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: a7afeea7b6 -s ours am: eae2b4dbfb -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11988027
Change-Id: Ie5da1b5381b86b1c469d46a32817f14c6fb640ac
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions