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