| commit | a6b7c5a7b11af0671cde1b20e4c76c9d16113ef8 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Fri Oct 17 18:53:01 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 17 18:53:01 2014 +0000 |
| tree | f782677e86574fdabf13c605e85c18ecb91ce33e | |
| parent | 20a7afd4b4fb0bc38ea3d4920f62e337c1011219 [diff] | |
| parent | 4142d9b01d6485afddf7567f1da9959361d6a687 [diff] |
am 4142d9b0: am 7d96dc6d: Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev * commit '4142d9b01d6485afddf7567f1da9959361d6a687': Fix getStorageEncryptionStatus() in DevicePolicyManager