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