diff options
author | Bill Yi <byi@google.com> | 2021-09-12 13:15:59 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-12 13:15:59 +0000 |
commit | 39dfb813385de65090a669b691dc523f7fdf925c (patch) | |
tree | bad30ec36b56663f55f4c40419745aabb87bfad0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 8ad9ec5296787d296b5880197e89ec5759e964f8 (diff) | |
parent | 8aa7ec2240789229612d77de2e8e6d4ad2d40c36 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 1c5b9275b5 -s ours am: 8aa7ec2240 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15807887
Change-Id: I9114679d1850b33dc22f94bc94f01c8c73712627
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions