commit | 07f6b5581a65e0a4af7a94cb97b6e190cb3e2c0e | [log] [tgz] |
---|---|---|
author | Andrew Scull <ascull@google.com> | Fri Sep 08 19:34:42 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Sep 08 19:34:42 2017 +0000 |
tree | c7d42b57daae9f77b96939ca44e0bd570a1ba1f8 | |
parent | 7f3510110c10d4511245dbdbaade359546c9c788 [diff] | |
parent | 5664b30008cfd2a83a06675b43997166efbd79ed [diff] |
Merge "OemLockService: remove canUserAllowOemUnlock()" into oc-mr1-dev am: 5664b30008 Change-Id: Ie38c731b4e1119e8cef707cd58e4f32ab68a7d1b