tree 92722cf6c3569d6d6d8bc04c65b4a49198663424
parent 75698757c4d3d90fc2b7756b8c568ad7b1810a44
parent 2146f7ef42d64c88d01ebcb39a55b9e78571ab5a
author Peng Xu <pengxu@google.com> 1484789208 +0000
committer android-build-merger <android-build-merger@google.com> 1484789208 +0000

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

Change-Id: I0bf7252556efe2dcaa53e36d432c114776085a62