Merge \"Add InputMethodService#exposeContent()\" into nyc-mr1-dev

author Yohei Yukawa <yukawa@google.com>

Thu, 23 Jun 2016 01:29:58 +0000 (01:29 +0000)

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

Thu, 23 Jun 2016 01:29:58 +0000 (01:29 +0000)
author Yohei Yukawa <yukawa@google.com>
Thu, 23 Jun 2016 01:29:58 +0000 (01:29 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 23 Jun 2016 01:29:58 +0000 (01:29 +0000)
diff --cc Android.mk
Simple merge
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
author	Yohei Yukawa <yukawa@google.com>
	Thu, 23 Jun 2016 01:29:58 +0000 (01:29 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 23 Jun 2016 01:29:58 +0000 (01:29 +0000)
		1	2
Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
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