tree 1bfd2edf7876475a34a542b72e9f1fda66ff8bfa
parent f68525931e1b9ab6938d87bb95a2fa7966f046c4
parent 2309f76d17171a4e9b2593ff248861eb3a41ec5a
author Paul Lawrence <paullawrence@google.com> 1445439790 +0000
committer android-build-merger <android-build-merger@google.com> 1445439790 +0000

Merge "Don\'t show UI on default encryption" into mnc-dr-dev
am: 2309f76d17

* commit '2309f76d17171a4e9b2593ff248861eb3a41ec5a':
  Don't show UI on default encryption