OSDN Git Service

Merge "[NAN] Replace int peerId with more opaqure Object peerHandle per API review...
authorEtan Cohen <etancohen@google.com>
Mon, 26 Sep 2016 19:00:15 +0000 (19:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 26 Sep 2016 19:00:15 +0000 (19:00 +0000)
commitb319bc2bf79ceafc5da804dddcbef6a23d49f1fe
treebaa09b72e33cc180a7ff67448f258e28af7fc452
parentb893a93dc1ead401c9de9a61d9a40e670f2f9493
parentbc74135d6af93e0217e6f9ac87247dfd4abd81aa
Merge "[NAN] Replace int peerId with more opaqure Object peerHandle per API review" am: 88da460cd8
am: bc74135d6a

Change-Id: I1368c0bfe18415126924e13eebe30f9061ac5b41