tree f51e7bdb18318234d9e0161b8ccd62f010136de4
parent b7e05f85c92fc5c40ed3a516662e6b70b5de4245
parent 467d3b75e8f8253b05970079bc0bb866472dc969
author Peng Xu <pengxu@google.com> 1484789815 +0000
committer android-build-merger <android-build-merger@google.com> 1484789815 +0000

Merge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor" am: cec2ebf676 am: 8cddb920b5 am: 2146f7ef42
am: 467d3b75e8

Change-Id: I4abeafb747d5f0798eec21e6244482ebc94a4c67