| commit | 738eeb6ff051e83c035255343befaf6cd44cd8c1 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Mar 11 18:08:17 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 11 18:08:17 2014 +0000 |
| tree | 3f3c7cd36597d7f3741182a072f3fd058d964a4e | |
| parent | 4179ed2f45e3b9c42308a711857e29e7c0fb6893 [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