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)
am: 7417f60856

Change-Id: I5e6227b8f209199388ef8f5f0afebd7d62816786


Trivial merge