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