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