tree 3ac5caa2e880446aeb60c355a1362d496de832e0
parent 78584643b0ea314988005349d1e06d8586538317
parent 22119eeda8fb803141298ee4bd774f6ad7312c55
author Nick Vaccaro <nvaccaro@google.com> 1480564002 +0000
committer android-build-merger <android-build-merger@google.com> 1480564002 +0000

[DO NOT MERGE ANYWHERE] Fix bodysensor permission am: 1f24f0f597  -s ours
am: 22119eeda8  -s ours

Change-Id: I308920bf6b371c4f7b690f3066092a2bd5fb1db7