diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-21 18:31:10 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-21 18:31:10 +0000 |
commit | 5a65343a4ef46065d2d4d6e52065c9252ad2494d (patch) | |
tree | c5591c8585bb5401e40c6b35a7896599ebd6bd7d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 91b5c15c4ded6dd18c2551590f18fa61e0f681c3 (diff) | |
parent | 33eada39b993ec0e8509dda70627614d0e823b4a (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 5b962929bf -s ours am: f2e45704c6 -s ours am: 1b3274ca17 -s ours am: 33eada39b9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11937074
Change-Id: I06ce26050a3535173f09b3876081fe77d1dc00d5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions