tree 69687fc3bc6236f59c1e2c85a007825805ced5d9
parent f0c1af8e4b00a973914a1a3fe22f6d0f98fb704f
parent 7d96dc6d98774ff9b7cf1370f9a5508c4eac6a85
author Jim Miller <jaggies@google.com> 1413538477 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413538477 +0000

am 7d96dc6d: Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev

* commit '7d96dc6d98774ff9b7cf1370f9a5508c4eac6a85':
  Fix getStorageEncryptionStatus() in DevicePolicyManager