OSDN Git Service

am c220d8e5: Stop crypto UI from crashing during encryption automerge: 0e6178b autome...
authorPaul Lawrence <paullawrence@google.com>
Fri, 24 Oct 2014 21:30:13 +0000 (21:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 24 Oct 2014 21:30:13 +0000 (21:30 +0000)
commit60302f1938e684407458e61b082353bf770c5dac
treea80fdbccef66239c0d131188fbc5d18b8a2633f0
parenta8aa03efa7541b1e6144028271a4d1635aeebfac
parent31deee5e307c00245d0fc7fd09dfe299145e1e0c
am c220d8e5: Stop crypto UI from crashing during encryption automerge: 0e6178b automerge: e20dd30
automerge: 31deee5

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