tree 6c7aec53e69692877229da69e9037334a793b8b9
parent 6e164ea4a14fbaf7350b38cea288a603c05c0fbf
parent b2f682bda8443fb93ab67f19be84fd80d5ed2838
author Paul Lawrence <paullawrence@google.com> 1410207664 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410207664 +0000

am b2f682bd: Fix Shamus bricked by encryption upgrade

* commit 'b2f682bda8443fb93ab67f19be84fd80d5ed2838':
  Fix Shamus bricked by encryption upgrade