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)
am: bc74135d6a

Change-Id: I1368c0bfe18415126924e13eebe30f9061ac5b41


Trivial merge