Merge "Sensors: Add LOW_LATENCY_OFFBODY_DETECT sensor API"

author Nick Vaccaro <nvaccaro@google.com>

Tue, 14 Feb 2017 19:21:33 +0000 (19:21 +0000)

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

Tue, 14 Feb 2017 19:21:37 +0000 (19:21 +0000)
author Nick Vaccaro <nvaccaro@google.com>
Tue, 14 Feb 2017 19:21:33 +0000 (19:21 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 14 Feb 2017 19:21:37 +0000 (19:21 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
diff --cc core/java/android/hardware/Sensor.java
Simple merge
author	Nick Vaccaro <nvaccaro@google.com>
	Tue, 14 Feb 2017 19:21:33 +0000 (19:21 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 14 Feb 2017 19:21:37 +0000 (19:21 +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
core/java/android/hardware/Sensor.java	patch \|	diff1 \|	diff2 \|	blob \| history