diff options
author | Bill Yi <byi@google.com> | 2020-06-06 14:31:50 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-06 14:31:50 +0000 |
commit | 9f26704b5b12f269ee273fd792e60d6ef475b207 (patch) | |
tree | b3963b616eb3781c5f8bd4f1cfced083132a3f44 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 54cea41ef50254622cd4044160305c78fb74bfcd (diff) | |
parent | 0b958c5e34fd91e747a44d2c4a3d64961795364d (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 570c6a4e40 -s ours am: 70018d6989 -s ours am: 0b958c5e34 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11753726
Change-Id: Ia8fdf4a837942216cab8da753c5df9bf50802f9b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions