OSDN Git Service

Merge "Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev am...
authorJeff Sharkey <jsharkey@android.com>
Fri, 27 May 2016 17:19:55 +0000 (17:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 May 2016 17:19:55 +0000 (17:19 +0000)
commit95deb0338093f8764175353736858e29b5213921
tree49bc6444c988cc57b6d281d0636c4e1d57290868
parent42facec8562093a398546a55d59959a28cf7c4be
parent2cffcf29ce961c603543959d1ead423cb260d296
Merge "Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev am: 36cbf5ca37 am: 6843da1aa8" into nyc-mr1-dev-plus-aosp
am: 2cffcf29ce

* commit '2cffcf29ce961c603543959d1ead423cb260d296':

Change-Id: I22cb6b1d5f1727433d2d10a3e34cb1df1d63fa02