tree a80fdbccef66239c0d131188fbc5d18b8a2633f0
parent a8aa03efa7541b1e6144028271a4d1635aeebfac
parent 31deee5e307c00245d0fc7fd09dfe299145e1e0c
author Paul Lawrence <paullawrence@google.com> 1414186213 +0000
committer android-build-merger <android-build-merger@google.com> 1414186213 +0000

am c220d8e5: Stop crypto UI from crashing during encryption automerge: 0e6178b automerge: e20dd30
automerge: 31deee5

* commit '31deee5e307c00245d0fc7fd09dfe299145e1e0c':
  Stop crypto UI from crashing during encryption