diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-08-19 00:06:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-19 00:06:03 +0000 |
| commit | eadafbb63e754a04a1ba4308dfec6aaaf8b7bd3d (patch) | |
| tree | 6ec6fc942eb504acc3b8a35ddc02b869d9af77f4 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 029e3f5419e3801201c28ba0071689970cbe30d1 (diff) | |
| parent | 60f0d698d5cda1a281f154a161d644cb3400ed3f (diff) | |
[automerger skipped] Merge "Disable smart lock when in power menu on lock screen" into sc-qpr1-dev am: 60f0d698d5 -s ours
am skip reason: Merged-In Id353faa1176882b6b9dfb9acd72288a3e0173aa0 with SHA-1 525fd25296 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15566948
Change-Id: I27f941f5d9a3875f11e9dc8b6ead3ee53aacb436
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions