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