| commit | 7d48d460c0860ff4a5317533533fbb5f63964fb2 | [log] [tgz] |
|---|---|---|
| author | Jordan Jozwiak <jjoz@google.com> | Fri Jun 12 16:39:52 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 12 16:39:52 2020 +0000 |
| tree | cfa9e077e0b0148992e42173225e1c11ab906f23 | |
| parent | 412d74f4eabf25b5fc22eb089283ba4975df0441 [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: I0fd8b8fa83c874edbee446fcf47d479b4345bd5c