| commit | 9c954fe2944b014c725ab54e9fe28fe62c0d6d19 | [log] [tgz] |
|---|---|---|
| author | Etan Cohen <etancohen@google.com> | Thu Oct 06 02:25:30 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Oct 06 02:25:30 2016 +0000 |
| tree | 6c1cdda0e2de1cb4a3248cad4c2ead5b01d80a39 | |
| parent | eb0388fc997c260f58f3872c6242648f6326f2ad [diff] | |
| parent | 95fad688c31121aa100d6092531a3bd6c69eb05d [diff] |
Merge "[NAN] Add COARSE_LOCATION permission check to NAN discovery" am: ee1e81ec5d am: c5101c52b6 am: 97b3d99577 am: 95fad688c3 Change-Id: I07444f201db7c5629413f9e96a2837c1d24a8b11