tree 4ce54c223362ee58f314dfa46823ca7b2e6d5661
parent 26f0a1cee21cd463f5ecfa6333c688cd515e23ad
parent bfa4c45506e9db20be6cfc58bf3ae5d2837c21bb
author Neil Fuller <nfuller@google.com> 1436176604 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436176604 +0000

am bfa4c455: Merge "Add OsConstants.TIOCOUTQ"

* commit 'bfa4c45506e9db20be6cfc58bf3ae5d2837c21bb':
  Add OsConstants.TIOCOUTQ