tree 91057f2d047bba42498f9906aca3ebe748a96f5e
parent 86b20dcef4b91298efee59f4bed24d6ab2be3ad1
parent 0627130b28c7f0eafbf9c2b062ff0c662a8c73a5
author Peng Xu <pengxu@google.com> 1475033813 +0000
committer android-build-merger <android-build-merger@google.com> 1475033813 +0000

Merge "[sensorservice] Fix inconsistent states in SensorDevice" into cw-f-dev
am: 0627130b28

Change-Id: Ifa7a7da62d5862a261c491db9c2ed701e18ad59b