tree ac554851f78ae67b2926eeac1966befe57eb2899
parent 2a70aba8460eff1bfb1417c271c6a5a53c560afa
parent 1f262b35fef5108e3bd3fbea4b6aa1ce635767f9
author Elliott Hughes <enh@google.com> 1404346094 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404346094 +0000

am 1f262b35: Merge "Fix recv.cpp so it can build with clang."

* commit '1f262b35fef5108e3bd3fbea4b6aa1ce635767f9':
  Fix recv.cpp so it can build with clang.