tree e4a575f9a518fa117a5bfcf24995c0d5ef4b90b3
parent fe27746e5f1776b798bf524f184c22faa3d683f6
parent 8d4f6a3fb2536bde37e1a4e9eed36a40d58659c2
author Nick Vaccaro <nvaccaro@google.com> 1480372348 +0000
committer android-build-merger <android-build-merger@google.com> 1480372348 +0000

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

Change-Id: Ibb5d37380fbf787fef2b6e4ec1d52defc750331d