| commit | 97b3d99577fdaf470d20632b7b2a8a49ced816da | [log] [tgz] |
|---|---|---|
| author | Etan Cohen <etancohen@google.com> | Thu Oct 06 02:16:08 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Oct 06 02:16:08 2016 +0000 |
| tree | bbf126823ba500561ccaf1ff463e058884f08dcd | |
| parent | d7dc327bc1fb5fa9d5b9d6387fd679976dbf4970 [diff] | |
| parent | c5101c52b6e5f242b25c6e58f449b4c13810bf5b [diff] |
Merge "[NAN] Add COARSE_LOCATION permission check to NAN discovery" am: ee1e81ec5d am: c5101c52b6 Change-Id: Ib3d02752745845d4966965c98dac9d47e0551d6d