diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-15 06:19:21 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-15 06:19:21 +0000 |
commit | d14ada2b3b33c4ca49707438b9301f493c5dd5dd (patch) | |
tree | 03e554779137af9754e3c9f088d7ffb8bf1b991e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 197ebb2a11a4efc538258ebb7b0c8bcfd151c541 (diff) | |
parent | 3563c8cc3947eddee74b29d1480850d54c99beb1 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 316f0d3604 -s ours am: 3563c8cc39 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11859966
Change-Id: Iad602834fe643cd8e14ccd34a732ae5a6ef59f8a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions