tree 1d15716db82db0eb0e3c1e4043dbc35b7065a5d7
parent 24e834ab6037cee0d3e8569d5fd45695f86865bd
parent 40af09297f9d60a3cfd4a186ff294cef6255a9df
author Paul Lawrence <paullawrence@google.com> 1410907398 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410907398 +0000

am 40af0929: Fix charger mode on first boot of force encrypt devices

* commit '40af09297f9d60a3cfd4a186ff294cef6255a9df':
  Fix charger mode on first boot of force encrypt devices