| commit | ce57bd15e3f51eee84d05d1cf7f3c7f5688052b9 | [log] [tgz] |
|---|---|---|
| author | Clay Murphy <claym@google.com> | Tue Mar 18 10:51:17 2014 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 18 10:51:17 2014 -0700 |
| tree | 4df0a0605c86bcbcf40f3f24dd46cea39249464f | |
| parent | 9dcff859f3c78946ad8aff3dde14e45da91aae76 [diff] | |
| parent | 75b3bcfea22c22aa331ae51a123c201b52972af0 [diff] |
am 75b3bcfe: Merge "Docs: Consolidating encryption, fixing nav." * commit '75b3bcfea22c22aa331ae51a123c201b52972af0': Docs: Consolidating encryption, fixing nav.