tree ed99ff9ce729c3d90b2f3b1e448a4a2526003923
parent 47ba10d6d53e0d2e54453fe62324afdfa8d6c78a
author Paul Lawrence <paullawrence@google.com> 1410200899 -0700
committer Paul Lawrence <paullawrence@google.com> 1410205946 -0700

Fix Shamus bricked by encryption upgrade

Bug: 17358530
Change-Id: I95207b62131224a2ed7ae3b75621a09acd69ea79