am 71bb6a2a: Merge "Return a runtime error if decryption fails instead of asserting." into honeycomb
am 71bb6a2a: Merge "Return a runtime error if decryption fails instead of asserting." into honeycomb

* commit '71bb6a2a3eb668fe7459cd8fff1f65a15804c3be':
  Return a runtime error if decryption fails instead of asserting.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base