OSDN Git Service

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

Change-Id: I2a66aaddd67dc0cbc2b876121185f2d153f587ea


Trivial merge