Merge "Changed EXTRA_DATA_EXTRAS to EXTRA_CLIENT_STATE." into oc-dev

author Felipe Leme <felipeal@google.com>

Fri, 28 Apr 2017 20:37:38 +0000 (20:37 +0000)

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

Fri, 28 Apr 2017 20:37:38 +0000 (20:37 +0000)
author Felipe Leme <felipeal@google.com>
Fri, 28 Apr 2017 20:37:38 +0000 (20:37 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 28 Apr 2017 20:37:38 +0000 (20:37 +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	Felipe Leme <felipeal@google.com>
	Fri, 28 Apr 2017 20:37:38 +0000 (20:37 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 28 Apr 2017 20:37:38 +0000 (20:37 +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