| commit | 1c71776f9bf93def0f24d708ce1ea050a2a12939 | [log] [tgz] |
|---|---|---|
| author | Jordan Jozwiak <jjoz@google.com> | Fri Jun 12 16:32:46 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 12 16:32:46 2020 +0000 |
| tree | d70fccbc3d2d0771ba8f69d3b7bc6b518536fc19 | |
| parent | c112078a2761bec4dd1e2c00b97749fa8f6f6ff0 [diff] | |
| parent | 9ead5a3c056761a54ea068e67134db5f2776bdd3 [diff] |
DO NOT MERGE - Allow locking with feature or permission am: 9ead5a3c05 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739858 Change-Id: If2799ec77afaf273db94e88bf101da0de28ec9a0