| commit | 79f36b5534f2314b3515b84beaaebdb675be7074 | [log] [tgz] |
|---|---|---|
| author | Jordan Jozwiak <jjoz@google.com> | Fri Jun 12 17:16:22 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 12 17:16:22 2020 +0000 |
| tree | cfa9e077e0b0148992e42173225e1c11ab906f23 | |
| parent | 45701de93f19122baf16ace8c2a57c33fb9a3e95 [diff] | |
| parent | 3c38b25d42678a7a6f438720fa216528d299a94b [diff] |
Merge "DO NOT MERGE - Allow locking with feature or permission" into rvc-dev am: 7048655cbe am: 5756ae944f am: 3c38b25d42 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739858 Change-Id: I7ff5321fb98ded9a0b1cca177eaf12c79670855e