tree 75007f09318df2f96cc375064168c7df005c154b
parent 14a26131c7f33d6dd11cdaed798ed06dd730143f
parent 06dbc22839ff8e411405f6b9c0635cdd0fd8b4d5
author Ken Sumrall <ksumrall@android.com> 1349820777 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349820777 -0700

am 06dbc228: am 9dedfd47: Fix encryption on certain devices

* commit '06dbc22839ff8e411405f6b9c0635cdd0fd8b4d5':
  Fix encryption on certain devices