Merge "Use ProviderException in AndroidKeyStore." into mnc-dev

author Alex Klyubin <klyubin@google.com>

Thu, 7 May 2015 17:43:29 +0000 (17:43 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Thu, 7 May 2015 17:43:30 +0000 (17:43 +0000)
author Alex Klyubin <klyubin@google.com>
Thu, 7 May 2015 17:43:29 +0000 (17:43 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 7 May 2015 17:43:30 +0000 (17:43 +0000)
diff --cc keystore/java/android/security/KeyStoreCipherSpi.java
Simple merge
author	Alex Klyubin <klyubin@google.com>
	Thu, 7 May 2015 17:43:29 +0000 (17:43 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 7 May 2015 17:43:30 +0000 (17:43 +0000)