tree ffd842d8f747a9f94774548e39a8d3b0a98077f7
parent 53ebeef0fb82fc223d03fac27ce25c1d6efa1c87
parent 8cddb920b53462e3fe2aa5c2af6f99d71150ea1b
author Peng Xu <pengxu@google.com> 1484788942 +0000
committer android-build-merger <android-build-merger@google.com> 1484788942 +0000

Merge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor" am: cec2ebf676
am: 8cddb920b5

Change-Id: I60391477badc56373f231911aae4172ee8d5cdf0