am f0b6ed57: Merge "Avoid htons and ntohs in deSocket"
authorPyry Haulos <phaulos@google.com>
Tue, 30 Jun 2015 21:20:15 +0000 (21:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 30 Jun 2015 21:20:15 +0000 (21:20 +0000)
* commit 'f0b6ed57bb8f4d05d9bc2099f6396fb5fdb4595d':
  Avoid htons and ntohs in deSocket


Trivial merge