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)
am: 9ba1142190

Change-Id: I9447de8e5bb84579681397e8d79b55db1614ea76


Trivial merge