tree baa09b72e33cc180a7ff67448f258e28af7fc452
parent b893a93dc1ead401c9de9a61d9a40e670f2f9493
parent bc74135d6af93e0217e6f9ac87247dfd4abd81aa
author Etan Cohen <etancohen@google.com> 1474916415 +0000
committer android-build-merger <android-build-merger@google.com> 1474916415 +0000

Merge "[NAN] Replace int peerId with more opaqure Object peerHandle per API review" am: 88da460cd8
am: bc74135d6a

Change-Id: I1368c0bfe18415126924e13eebe30f9061ac5b41