tree e0c9eece392672be5242a6c7151dbbe750856605
parent fe6eb8761d33d33fac7f5278ea2ee7fff01531da
parent cec2ebf676c6ba0f44f9d3c41ca63317f65c179d
author Peng Xu <pengxu@google.com> 1484788662 +0000
committer android-build-merger <android-build-merger@google.com> 1484788662 +0000

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

Change-Id: I1f66dba79c07315ca07edf65ff4e7f1135083d6e