tree fcd082a03a9e063853590d0bf6c1d2ba24dba0cb
parent b18004a996db7fd62425c86c52270b9498fa02b2
parent 4dfd5da62dc19df9a5a2dff41c19ea5153c703f9
author Elliott Hughes <enh@google.com> 1516825113 +0000
committer android-build-merger <android-build-merger@google.com> 1516825113 +0000

Merge "Add missing sensor types to <android/sensor.h>." am: ced274e88d
am: 4dfd5da62d

Change-Id: Ic4f660a8817670f30075556f460cfaf8594b59b1