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