tree 24961fec4fc76c1310705e882d1b9f49dd7d5736
parent e061a5922ac356cfc6d51524bc58677b79944136
parent 09746d898099332a079af5349278e7c284fc2cbe
author Nick Vaccaro <nvaccaro@google.com> 1443366667 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443366667 +0000

am 09746d89: am 5eccf896: am faf3f370: Merge "Fix sensor usage model" into cw-e-dev

* commit '09746d898099332a079af5349278e7c284fc2cbe':
  Fix sensor usage model