tree 409d8b46be00a4c9d5d02f84b9fe679ec6bd787a
parent e7df2e3f6eb1f847cc362f70b062fc76e7825d30
parent 9cf4d01b7c46401ba632db2efa471bb262bc30aa
author Andrew Hsieh <andrewhsieh@google.com> 1345679578 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345679578 -0700

am 9cf4d01b: am 51f72cc1: Merge "Support asm/sockios.h for MIPS."

* commit '9cf4d01b7c46401ba632db2efa471bb262bc30aa':
  Support asm/sockios.h for MIPS.