| commit | a4de5f0796d00a3e507d67ecae6823ef78202114 | [log] [tgz] |
|---|---|---|
| author | Jordan Jozwiak <jjoz@google.com> | Fri Jun 12 16:41:38 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 12 16:41:38 2020 +0000 |
| tree | cfa9e077e0b0148992e42173225e1c11ab906f23 | |
| parent | 2b8df14b22bacbe000aca82b0fb28010bfd3344e [diff] | |
| parent | 412d74f4eabf25b5fc22eb089283ba4975df0441 [diff] |
DO NOT MERGE - Allow locking with feature or permission am: 9ead5a3c05 am: 1c71776f9b am: 412d74f4ea Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739858 Change-Id: Ie7008d7a6a1fab03e268d3b9bc6887cad2c67af9