tree 778395704d7757ffaee95bb3d85d67bdfae29df7
parent c6fd09eaaca2332cafff1cfcccca29c2b9127ee8
parent e5faca1d4ac0de0920d379dca656c0f809045640
author Elliott Hughes <enh@google.com> 1440677269 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440677269 +0000

am e5faca1d: (-s ours) am bdb15a2a: Merge "Use _WIN32 rather than HAVE_WINSOCK in librilutils."

* commit 'e5faca1d4ac0de0920d379dca656c0f809045640':