Merge "SharedMemory API changes" into oc-mr1-dev

author John Reck <jreck@google.com>

Thu, 10 Aug 2017 19:53:25 +0000 (19:53 +0000)

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

Thu, 10 Aug 2017 19:53:25 +0000 (19:53 +0000)
author John Reck <jreck@google.com>
Thu, 10 Aug 2017 19:53:25 +0000 (19:53 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 10 Aug 2017 19:53:25 +0000 (19:53 +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	John Reck <jreck@google.com>
	Thu, 10 Aug 2017 19:53:25 +0000 (19:53 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 10 Aug 2017 19:53:25 +0000 (19:53 +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