| commit | 5769638f7c43c55c098b109b12b488913dde60c5 | [log] [tgz] |
|---|---|---|
| author | Clay Murphy <claym@google.com> | Tue Mar 18 20:52:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 18 20:52:46 2014 +0000 |
| tree | 05ca1e4f647370992ee2c0a82e0ebeb04c9ebc68 | |
| parent | 890e240c484a7304e3dd41c095527729a3d4ca29 [diff] | |
| parent | 3949fd43ad5f4201ecf1b1997efb2d7e14ce221a [diff] |
am 3949fd43: am ce57bd15: am 75b3bcfe: Merge "Docs: Consolidating encryption, fixing nav." * commit '3949fd43ad5f4201ecf1b1997efb2d7e14ce221a': Docs: Consolidating encryption, fixing nav.