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