| commit | 37db2fbfbddd1dd9614e3fcb3702375c9e16331f | [log] [tgz] |
|---|---|---|
| author | Etan Cohen <etancohen@google.com> | Mon Sep 26 19:06:11 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Sep 26 19:06:11 2016 +0000 |
| tree | 6f5eb14f922654df34489ccb5521e92a3c0a9c23 | |
| parent | 806299e3a9a418c3eb98e62448b3736e9faca9b9 [diff] | |
| parent | b319bc2bf79ceafc5da804dddcbef6a23d49f1fe [diff] |
Merge "[NAN] Replace int peerId with more opaqure Object peerHandle per API review" am: 88da460cd8 am: bc74135d6a am: b319bc2bf7 Change-Id: Ib0d578323b719b90d3330993d61079dc3885bf52