OSDN Git Service

Merge "[AWARE]: Document the default values in NAN enable/config" am: 1ea0399492...
authorEtan Cohen <etancohen@google.com>
Thu, 16 Feb 2017 21:15:02 +0000 (21:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Feb 2017 21:15:02 +0000 (21:15 +0000)
commitc9a3c2b7e5632646901ba0f9fa8ce5ac8a92cf29
tree65d0d313e41eac0d23febf0ae5437d22e5c75027
parentac800456dfb1940cdeda1ef6dbc3e36ab0127aa3
parent9ba114219042e6041193a9a28012aafa0091b36f
Merge "[AWARE]: Document the default values in NAN enable/config" am: 1ea0399492 am: 7417f60856
am: 9ba1142190

Change-Id: I9447de8e5bb84579681397e8d79b55db1614ea76