diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-24 18:31:06 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 18:31:06 +0000 |
commit | 5db9f63bb74d4cbc5b1080ed080cf8552a1b4209 (patch) | |
tree | bd44bbbf8dd45b9b5810c6f270906850080efa3a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | d2646b86871c4cf16184deb05111b762b0b530fc (diff) | |
parent | b9051228528cdf47d11f41d78a6cd985a060fdb0 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 2a35e0e321 -s ours am: ccc7f7246a -s ours am: b905122852 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11983878
Change-Id: Id1ef71ceecf601a604a8e0bd1c510a0be0f32e96
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions