Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev

author Chris Wren <cwren@android.com>

Mon, 23 May 2016 19:01:21 +0000 (19:01 +0000)

committer android-build-merger <android-build-merger@google.com>

Mon, 23 May 2016 19:01:21 +0000 (19:01 +0000)
author Chris Wren <cwren@android.com>
Mon, 23 May 2016 19:01:21 +0000 (19:01 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 23 May 2016 19:01:21 +0000 (19:01 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
author	Chris Wren <cwren@android.com>
	Mon, 23 May 2016 19:01:21 +0000 (19:01 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 23 May 2016 19:01:21 +0000 (19:01 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history