| commit | 6f60371228bc10c683620594cc92151bb1a31b17 | [log] [tgz] |
|---|---|---|
| author | Jordan Jozwiak <jjoz@google.com> | Fri Jun 12 16:32:53 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 12 16:32:53 2020 +0000 |
| tree | d70fccbc3d2d0771ba8f69d3b7bc6b518536fc19 | |
| parent | 1c71776f9bf93def0f24d708ce1ea050a2a12939 [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: Id15bb58fa014cfc1eadedf97d0d13da13dc7ba22