Merge "Don't crash in JNI: add DeadObjectException(String msg) ctor" into mnc-dev

author Christopher Tate <ctate@google.com>

Mon, 29 Jun 2015 23:46:36 +0000 (23:46 +0000)

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

Mon, 29 Jun 2015 23:46:38 +0000 (23:46 +0000)
author Christopher Tate <ctate@google.com>
Mon, 29 Jun 2015 23:46:36 +0000 (23:46 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 29 Jun 2015 23:46:38 +0000 (23:46 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
author	Christopher Tate <ctate@google.com>
	Mon, 29 Jun 2015 23:46:36 +0000 (23:46 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 29 Jun 2015 23:46:38 +0000 (23:46 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history