| commit | d210943b50f5fad9df9732d192491c4e0998ec5b | [log] [tgz] |
|---|---|---|
| author | Andrew Hsieh <andrewhsieh@google.com> | Thu Dec 20 11:06:55 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 20 11:06:55 2012 -0800 |
| tree | 8069aafdd47880e229da6183d4b984116243bc4c | |
| parent | 871e2f54ab8f0006e1ea8c51fc2f0963e5a6eeee [diff] | |
| parent | 26d1e005e5b728f8ffac5165e1358c8379090c55 [diff] |
am 26d1e005: am 852b3581: Merge "Sync pthread.h and resolv.h" * commit '26d1e005e5b728f8ffac5165e1358c8379090c55': Sync pthread.h and resolv.h