tree 4571e2d1cb446ad3958143eee6a769c6a4899366
parent a12d3831178616a171382f1546812c26245af2d0
parent 3e413dfcddf27f1a44012e4c1d2b80bdcacd1e26
author Nick Vaccaro <nvaccaro@google.com> 1453839697 +0000
committer android-build-merger <android-build-merger@google.com> 1453839697 +0000

Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev am: 907108ca0f  -s ours
am: 3e413dfcdd  -s ours

* commit '3e413dfcddf27f1a44012e4c1d2b80bdcacd1e26':
  [DO NOT MERGE ANYWHERE] Fix bodysensor permission