OSDN Git Service

Merge "Relax the sharedpreference check to look at StorageManager.isUserKeyUnlocked...
authorTony Mak <tonymak@google.com>
Thu, 11 May 2017 21:37:12 +0000 (21:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 11 May 2017 21:37:12 +0000 (21:37 +0000)
commitf4a8eb662392e027b034acc8506f3bc5ff44c27f
tree5b9caf275dc26132f0978fced6ee29e958a2b178
parent2ad3219be080ea76b3062599c1734e4363a47f95
parentdc37e5251fd4ac615085514751713ab66d35a8c2
Merge "Relax the sharedpreference check to look at StorageManager.isUserKeyUnlocked" into oc-dev am: e35e223a81
am: dc37e5251f

Change-Id: Iea2d49976f7608cf63809060d6857cd61d42ca2f
core/java/android/app/ContextImpl.java