| commit | 1154f12d2cb6de41f7c556771897e037783550ed | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Feb 26 19:44:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 26 19:44:30 2014 +0000 |
| tree | 45771e06391dcc69d1ed81c5288e42831f6075ac | |
| parent | e8b68f69f02adcb2ececa99ce7a146aabd712d55 [diff] | |
| parent | b155b976c7e5b0588de39c08d7f6bc7ad1b3e336 [diff] |
am b155b976: am 8828994d: am 431735f0: Merge "libcutils: Socket type might contain bitwise OR flags" * commit 'b155b976c7e5b0588de39c08d7f6bc7ad1b3e336': libcutils: Socket type might contain bitwise OR flags