| commit | 69a148c78671023d61b8e47cc173e98c87c0f8ac | [log] [tgz] |
|---|---|---|
| author | Clay Murphy <claym@google.com> | Tue Mar 18 17:56:57 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 18 17:56:57 2014 +0000 |
| tree | 4df0a0605c86bcbcf40f3f24dd46cea39249464f | |
| parent | c25462977636b7e9c567b1af7499f65c6d7e6c1c [diff] | |
| parent | ce57bd15e3f51eee84d05d1cf7f3c7f5688052b9 [diff] |
am ce57bd15: am 75b3bcfe: Merge "Docs: Consolidating encryption, fixing nav." * commit 'ce57bd15e3f51eee84d05d1cf7f3c7f5688052b9': Docs: Consolidating encryption, fixing nav.