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:19:56 +0000 (21:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Feb 2017 21:19:56 +0000 (21:19 +0000)
commit2f4508c1c913f7223dc2a7e9b8f20da04595f819
tree04da6848a76059552927838ec510b328fddde3e3
parent5ba74c71fc31814a182f0d07b7648c2007ab57cb
parentc9a3c2b7e5632646901ba0f9fa8ce5ac8a92cf29
Merge "[AWARE]: Document the default values in NAN enable/config" am: 1ea0399492 am: 7417f60856 am: 9ba1142190
am: c9a3c2b7e5

Change-Id: I213deacae4f5339b425833a65068fd3d802d0bcb