tree e9c39249795b472c2f98d06c81f4fc0460b13001
parent 3a9de10963d869fa8f721432ce12785de384c560
parent e1d8a5a6fc3661f226afff3fde59a3eb2c06d718
author Etan Cohen <etancohen@google.com> 1475706226 +0000
committer Android Partner Code Review <android-gerrit-partner@google.com> 1475706228 +0000

Merge "[NAN] Add COARSE_LOCATION permission check to NAN discovery [DO NOT MERGE]" into mm-wireless-dev