commit | 8828994d05572552da893db4663efd6e1e77948e | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Wed Feb 26 19:38:35 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 26 19:38:35 2014 +0000 |
tree | e4a9836f27b27f3f45601a413d2c4f8b17a85b4a | |
parent | f936f66c2abf132dff883f6d31f4cc0b8d20f984 [diff] | |
parent | 431735f005af79407e01a68995ac6dde7ff4b815 [diff] |
am 431735f0: Merge "libcutils: Socket type might contain bitwise OR flags" * commit '431735f005af79407e01a68995ac6dde7ff4b815': libcutils: Socket type might contain bitwise OR flags