commit | 3ef824fb5858609055034a07fa32daffecb9a301 | [log] [tgz] |
---|---|---|
author | Etan Cohen <etancohen@google.com> | Mon Sep 26 19:40:46 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Sep 26 19:40:46 2016 +0000 |
tree | a9ca01be537184971678148a522fb13b45843bb8 | |
parent | 8645e4c1b8da4bd5a6cbd5f8ca85a4b120d3cf43 [diff] | |
parent | 37db2fbfbddd1dd9614e3fcb3702375c9e16331f [diff] |
Merge "[NAN] Replace int peerId with more opaqure Object peerHandle per API review" am: 88da460cd8 am: bc74135d6a am: b319bc2bf7 am: 37db2fbfbd Change-Id: I4762a3d4af935081c5d456ca30daf561fcd312f5