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:10:32 +0000 (21:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Feb 2017 21:10:32 +0000 (21:10 +0000)
commit9ba114219042e6041193a9a28012aafa0091b36f
tree65d0d313e41eac0d23febf0ae5437d22e5c75027
parent59d92fd2b4c777141c72673386ae8cf933ca28e3
parent7417f6085670277656f2a196f9a6fbe9eb58315e
Merge "[AWARE]: Document the default values in NAN enable/config" am: 1ea0399492
am: 7417f60856

Change-Id: I5e6227b8f209199388ef8f5f0afebd7d62816786