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