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 18:56:16 +0000 (18:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 26 Sep 2016 18:56:16 +0000 (18:56 +0000)
am: 88da460cd8

Change-Id: I9debe0bec7569a9acb83d431fc5863b5b9bb5690


Trivial merge