OSDN Git Service

Merge "Add description to NAN API/error codes" am: 815654a3d8 am: 88596972ee am:...
authorEtan Cohen <etancohen@google.com>
Tue, 15 Nov 2016 17:48:48 +0000 (17:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 15 Nov 2016 17:48:48 +0000 (17:48 +0000)
commit696c65ca4c32bfbe1d1ff435a6f90ecddef6e59f
tree80d00b3f3954cb8b4a5aa418f7cd11e37d6670f6
parentc07bb1002132278978eeb38c7a74d1ba216a76c9
parent8a4a81a1b4bc90056c8c69a765078eda8da8ab0d
Merge "Add description to NAN API/error codes" am: 815654a3d8 am: 88596972ee am: 3872714e8d
am: 8a4a81a1b4

Change-Id: I4a438a246d15cc40296f246eb8f088a7c63b1a20