| commit | ca771fc396167347b8a434738829c20ff66bb20c | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jul 03 00:13:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 03 00:13:14 2014 +0000 |
| tree | b859bd7c35dd80485c6536aa359ce1ebee13ed61 | |
| parent | cda4006cc73827b6f3c77fd783ee22434e34a799 [diff] | |
| parent | bebe8de7e2d2df2605fe96f7426f26ecbcd7d251 [diff] |
am bebe8de7: am 1f262b35: Merge "Fix recv.cpp so it can build with clang." * commit 'bebe8de7e2d2df2605fe96f7426f26ecbcd7d251': Fix recv.cpp so it can build with clang.