OSDN Git Service

Merge "[NAN-AWARE] Rename NAN to Aware" am: 74b1131cc8
authorEtan Cohen <etancohen@google.com>
Sun, 6 Nov 2016 03:21:37 +0000 (03:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 6 Nov 2016 03:21:37 +0000 (03:21 +0000)
commita99a05982e181f079c0cdb63f753f1677bc55b4a
tree089975e8b4f3a80cc96915a8de4e048ff1a688b6
parente1166dd4881d8fc5f045e8e16941e26616ab774f
parent65710071018141fecd0346ed09e53c262939e54c
Merge "[NAN-AWARE] Rename NAN to Aware" am: 74b1131cc8
am: 6571007101

Change-Id: Ief54b313dc5ca5d30645b55ed2ad0333036a1671
Android.mk