Merge ""Unlocked device required" javadoc clarification" into pi-dev

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

Mon, 2 Apr 2018 21:40:34 +0000 (21:40 +0000)

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

Mon, 2 Apr 2018 21:40:34 +0000 (21:40 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Mon, 2 Apr 2018 21:40:34 +0000 (21:40 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 2 Apr 2018 21:40:34 +0000 (21:40 +0000)
diff --cc keystore/java/android/security/keystore/KeyGenParameterSpec.java
Simple merge
diff --cc keystore/java/android/security/keystore/KeyProtection.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Mon, 2 Apr 2018 21:40:34 +0000 (21:40 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 2 Apr 2018 21:40:34 +0000 (21:40 +0000)
		1	2
keystore/java/android/security/keystore/KeyGenParameterSpec.java	patch \|	diff1 \|	diff2 \|	blob \| history
keystore/java/android/security/keystore/KeyProtection.java	patch \|	diff1 \|	diff2 \|	blob \| history