| commit | fc4af7b77cbd1527afe9d5afd2fbfc0069d0a258 | [log] [tgz] |
|---|---|---|
| author | Vineeta Srivastava <vsrivastava@google.com> | Fri Apr 17 02:09:01 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 17 02:09:01 2015 +0000 |
| tree | 529e0ecf4c3aa5d76bb61fe74eed9a1decb33edf | |
| parent | 10bd23f39be70d11c6454da5390fcdb320dbf6a0 [diff] | |
| parent | 9b944d792f128d6b055e7616d0ad7bd525e1c2bd [diff] |
am 9b944d79: am 7e4067e9: am 968ced69: Merge "Revert "Revert "Enable encryption by default on Shamu""" into lmp-dev * commit '9b944d792f128d6b055e7616d0ad7bd525e1c2bd':