tree dc0e7de5b9405768a782b6b0b1a93cbf8c8e6db5
parent 48e64332f8b651343cb59d111305c8d3cea4e8da
parent 0ee6364c3461acc6c047d7c4f8a51d55feb172fd
author Kevin Hufnagle <khufnagle@google.com> 1474935157 +0000
committer android-build-merger <android-build-merger@google.com> 1474935157 +0000

Merge "docs: Fix for clarification fo location permissions, hardware" into nyc-dev am: 31d5deef80 am: adf7fc99e9
am: 0ee6364c34

Change-Id: Ia68944440397849ff3c42d292782acd72464a2c2