tree 08cf6c0d77c3e2c4c5629d86a7374f0bf6b4fc9c
parent f429d37807a005c1de38a7616669bf1834d45432
parent 751dfddc198b64409d035b8a80b526c0815432fb
author Paul Lawrence <paullawrence@google.com> 1445437658 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1445437658 +0000

Merge "Don't show UI on default encryption" into mnc-dr-dev