diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-09 00:35:10 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-09 00:35:10 +0000 |
commit | 12af6ab1334583fb68c348c62277a42c91dbeb4d (patch) | |
tree | 2a53a3eca9fca4e05853e38bd25471f32c8d3d4f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | c9a46b0043a2c3cc0385fe6571ffa4bf610ddcfe (diff) | |
parent | bd2d4ca0edd9f145ffad3e34a8d88c4271795784 (diff) |
Merge "Merge "Fix keyguard and qs user switcher disabled state" into rvc-dev am: 31b2931b9f am: ad10726514 am: 421ec2a159" into rvc-qpr-dev-plus-aosp am: bd2d4ca0ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11687318
Change-Id: I0eb101e03e87e5f3cbeaa5ff09458a615b84374b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions