Etan Cohen e3d5fa1094 Merge changes from topic 'cherry-pick' ...

* changes:
  [NAN] Register WIFI_NAN_STATE_CHANGED as protected broadcast
  [NAN] Update API javadoc to clarify NAN status change broadcast scope

2016-09-30 20:45:02 +00:00

..

java

Merge "Handle the race condition when calling uncrypt services."

2016-09-30 20:30:43 +00:00

jni

Fix code for new malloc debug enable.

2016-09-29 15:18:58 -07:00

res

Merge changes from topic 'cherry-pick'

2016-09-30 20:45:02 +00:00

tests

Remove ability to set frequency from WifiAssociationTest

2016-09-20 15:33:49 -07:00