tree e10ee9a60cbee9dd7660f3316dfd48451d530e01
parent 80bef07ecac200494f0525e81c02f2ff8a161c6c
parent 9981e410a2c67c513f2c2a1604170a55f3166052
author Kevin Hufnagle <khufnagle@google.com> 1474942915 +0000
committer android-build-merger <android-build-merger@google.com> 1474942915 +0000

Merge "Merge "docs: Fix for clarification fo location permissions, hardware" into nyc-dev am: 31d5deef80 am: e71d457e64" into nyc-mr1-dev-plus-aosp
am: 9981e410a2

Change-Id: I77d0f9026841fa3b5f41544de6675aa71ae2c32d