tree d6a0c4cc2408359d16673ca60f36a74da58a3d3b
parent 17c2af88828379ca30eca9192987b016bd00f013
parent 707f7eff31ceb5ac886ac16920aea7e5ffad8cfe
author Clay Murphy <claym@google.com> 1400693146 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1400693146 +0000

Merge "Fix encryption documentation for LMP"