OSDN Git Service

Merge "Add description to NAN API/error codes"
authorEtan Cohen <etancohen@google.com>
Tue, 15 Nov 2016 17:25:36 +0000 (17:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 15 Nov 2016 17:25:36 +0000 (17:25 +0000)
commit88596972ee3b6ee48a79359025a6ddbd4e855310
tree14ec6477bcc9c9538775f83c33a2f675416b59f8
parent785955a49f727ddfb9d5e4f5abdf745635cddf0b
parent815654a3d8257e8fc29354af089969168dc0fee5
Merge "Add description to NAN API/error codes"
am: 815654a3d8

Change-Id: Id111bff19ee94a365d5d6fb777e8dbe8b867e092