diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-23 18:10:27 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 18:10:27 +0000 |
commit | 1ec65ac76343ad89299b1b5b170a6d4f48b4cb34 (patch) | |
tree | fc17c75b7da7843009ab598d1c014ca1a7452dd8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | ddeac8b48ee80cdec6b2d79a1138fe82f3e51fa8 (diff) | |
parent | 89dc28eca48dca020a8a28fe0ed6369173561992 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: f8c312b928 -s ours am: 89dc28eca4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11964771
Change-Id: Ia66f6482a3b9689872c5a0c9a3dbcd807ef9ff0f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions