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