diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-09 06:26:31 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-09 06:26:31 +0000 |
commit | 052fc67425ac93132f3cdb7751420eb4d3e48187 (patch) | |
tree | b5ff1b8be69ebaec0896ae679d307db200f095aa /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 21d52061554ce315d9e1765a29dadd4d9edbb12f (diff) | |
parent | 1b52b5b430e6d7dd4424db86cf17a5f7632fa00c (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4ca1fdf950 -s ours am: 1b52b5b430 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11803019
Change-Id: Ifda8b720bd776484753790a75e952a03fef9064b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions