diff options
author | Bill Yi <byi@google.com> | 2021-09-12 13:16:58 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-12 13:16:58 +0000 |
commit | b7c753d422cb70b7dc2f8e4d987b0099d02b74f6 (patch) | |
tree | bad30ec36b56663f55f4c40419745aabb87bfad0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 8723f23c9412a03f0b1e0da5b5068c801238ae88 (diff) | |
parent | e658dc422a84a7c487b7c4a4d3523d9a4d33f048 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 54296def63 -s ours am: e658dc422a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15806411
Change-Id: Iaa0376ff57197f607de2a7e66d3b889940a6e453
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions