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