OSDN Git Service

[AWARE]: Enable NAN Security am: 548fbb3ab5
authorSubhani Shaik <subhanis@codeaurora.org>
Tue, 13 Dec 2016 15:13:44 +0000 (15:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Dec 2016 15:13:44 +0000 (15:13 +0000)
am: 6968799354

Change-Id: I6606803b630079150da0812e5c1f813a97e3f51f


Trivial merge