tree 42ab744d10a43db4121fa99f845290c004890568
parent e89c65fb94a62c3547b83a527107f6fbd824d78a
parent 6826b25c223c91d603f3a8e2b0d1ce5abe1e13e5
author Jeff Tinker <jtinker@google.com> 1436304845 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436304845 +0000

am 6826b25c: Merge "Report specific exception type on decrypt with invalid session" into mnc-dev

* commit '6826b25c223c91d603f3a8e2b0d1ce5abe1e13e5':
  Report specific exception type on decrypt with invalid session