OSDN Git Service

Merge "[NAN] Use a hidden class for peer ID opaque handle" am: e43c1a3e3e
authorEtan Cohen <etancohen@google.com>
Wed, 28 Sep 2016 05:20:02 +0000 (05:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 28 Sep 2016 05:20:02 +0000 (05:20 +0000)
commita96c6e222bc35f1c2048962c5a74d155b7e36299
tree8792bb679c54b0399cc498b72c694ce1126411aa
parentca68d73d588bfed3a16e246c6ae09a01ee98a07e
parent66741c2c0f959696ff85d91cad23e025863532e1
Merge "[NAN] Use a hidden class for peer ID opaque handle" am: e43c1a3e3e
am: 66741c2c0f

Change-Id: I5cef0e013ff9ca49216cc1e6c8208353f2d063f4