tree 09710b65c7453bac28131816887b48d3b280baa8
parent b8ce87175e3a865feaad7c6aa49226f768729540
parent 1fceaf9d63cd572cad57e71f6cb66f0cb59183b5
author Etan Cohen <etancohen@google.com> 1475260374 +0000
committer Android Partner Code Review <android-gerrit-partner@google.com> 1475260374 +0000

Merge "[NAN] Update API javadoc to clarify NAN status change broadcast scope [DO NOT MERGE]" into mm-wireless-dev