Merge "Add KeyPermanentlyInvalidatedException." into mnc-dev

author Alex Klyubin <klyubin@google.com>

Wed, 29 Apr 2015 23:48:13 +0000 (23:48 +0000)

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

Wed, 29 Apr 2015 23:48:14 +0000 (23:48 +0000)
author Alex Klyubin <klyubin@google.com>
Wed, 29 Apr 2015 23:48:13 +0000 (23:48 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 29 Apr 2015 23:48:14 +0000 (23:48 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
author	Alex Klyubin <klyubin@google.com>
	Wed, 29 Apr 2015 23:48:13 +0000 (23:48 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 29 Apr 2015 23:48:14 +0000 (23:48 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history