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