| commit | fe4534b304f8dac48bc6d9de652909fb54c79902 | [log] [tgz] |
|---|---|---|
| author | Jordan Jozwiak <jjoz@google.com> | Fri Jun 12 16:45:30 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 12 16:45:30 2020 +0000 |
| tree | d676ec4de68aa4b1dcf170c4d850341a4bb7b711 | |
| parent | 5f60fd793e230423ef12d00672ae79a0e9ce098f [diff] | |
| parent | 6f60371228bc10c683620594cc92151bb1a31b17 [diff] |
Merge "DO NOT MERGE - Allow locking with feature or permission" into rvc-dev am: 7048655cbe am: 6f60371228 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739858 Change-Id: I689e8cab41516429d605fa0cf1374521b280f04d