OSDN Git Service

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

Change-Id: I6186abb54eb2d5cfe52af5c571b7dfc2f26216e6


Trivial merge