diff options
author | Bill Yi <byi@google.com> | 2021-09-12 13:17:27 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-12 13:17:27 +0000 |
commit | 61246e7f0051758289a7423984a0b19a42f9c7c3 (patch) | |
tree | bad30ec36b56663f55f4c40419745aabb87bfad0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | f89703efa78d4039a1fa1bc0e339cbfb43f7e65b (diff) | |
parent | 2f7e887a15d06b32461e5248269772f0653a8fb7 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: c2a03f945e -s ours am: 73b407caba -s ours am: 2f7e887a15 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15810217
Change-Id: I176aca8a4018161a149f3b5134167d4da7c6c7e2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions