Merge "Add Keystore get option that supresses caught exceptions warnings."

author Treehugger Robot <treehugger-gerrit@google.com>

Fri, 8 Mar 2019 21:58:46 +0000 (21:58 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Fri, 8 Mar 2019 21:58:46 +0000 (21:58 +0000)
author Treehugger Robot <treehugger-gerrit@google.com>
Fri, 8 Mar 2019 21:58:46 +0000 (21:58 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 8 Mar 2019 21:58:46 +0000 (21:58 +0000)
diff --cc keystore/java/android/security/KeyStore.java
Simple merge
author	Treehugger Robot <treehugger-gerrit@google.com>
	Fri, 8 Mar 2019 21:58:46 +0000 (21:58 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Fri, 8 Mar 2019 21:58:46 +0000 (21:58 +0000)