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