tree fcc6d13f49d1c46b5fd65fd75d558df3f2b7bfc5
parent 4b50b66d828b92acd7ca0c2715fabe15970237e5
parent 169c90981ab86e103c0853cd19fab809a124f755
author Prashant Malani <pmalani@google.com> 1441317798 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441317798 +0000

am 169c9098: Merge "Give tests BODY_SENSORS permissions" into lmp-sprout-dev

* commit '169c90981ab86e103c0853cd19fab809a124f755':
  Give tests BODY_SENSORS permissions