| commit | c5101c52b6e5f242b25c6e58f449b4c13810bf5b | [log] [tgz] |
|---|---|---|
| author | Etan Cohen <etancohen@google.com> | Thu Oct 06 02:12:22 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Oct 06 02:12:22 2016 +0000 |
| tree | 3056976135ba41b065089fad0548cdc0dae91844 | |
| parent | 553866e9c33bd8f0a1bc59ddf6ca533fda75b5b9 [diff] | |
| parent | ee1e81ec5dae82cae9efc424f902711d561a5075 [diff] |
Merge "[NAN] Add COARSE_LOCATION permission check to NAN discovery" am: ee1e81ec5d Change-Id: I606be878116457c91d3c036a4a0086207a5a6752