OSDN Git Service

am 4142d9b0: am 7d96dc6d: Merge "Fix getStorageEncryptionStatus() in DevicePolicyMana...
authorJim Miller <jaggies@google.com>
Fri, 17 Oct 2014 18:53:01 +0000 (18:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 17 Oct 2014 18:53:01 +0000 (18:53 +0000)
commita6b7c5a7b11af0671cde1b20e4c76c9d16113ef8
treef782677e86574fdabf13c605e85c18ecb91ce33e
parent20a7afd4b4fb0bc38ea3d4920f62e337c1011219
parent4142d9b01d6485afddf7567f1da9959361d6a687
am 4142d9b0: am 7d96dc6d: Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev

* commit '4142d9b01d6485afddf7567f1da9959361d6a687':
  Fix getStorageEncryptionStatus() in DevicePolicyManager