Merge changes from topic 'LOHSapi' into oc-dev

author Jeff Sharkey <jsharkey@google.com>

Mon, 1 May 2017 22:35:01 +0000 (22:35 +0000)

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

Mon, 1 May 2017 22:35:05 +0000 (22:35 +0000)
author Jeff Sharkey <jsharkey@google.com>
Mon, 1 May 2017 22:35:01 +0000 (22:35 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 1 May 2017 22:35:05 +0000 (22:35 +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	Jeff Sharkey <jsharkey@google.com>
	Mon, 1 May 2017 22:35:01 +0000 (22:35 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 1 May 2017 22:35:05 +0000 (22:35 +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