| commit | 7d20a9486d52d3e0747e34fb717830fcdad21933 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Fri Mar 07 20:15:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 07 20:15:50 2014 +0000 |
| tree | 6b2bc856bb2a191a052b0a3311fd8e4f577ea038 | |
| parent | cb66e5e0fa527d958f97fe835c35dbbf82810fb9 [diff] | |
| parent | 5c057d44e5869b8acb779d48a4b821859040d9c8 [diff] |
am 5c057d44: Merge "Remove use of pthread_mutex_lock_timeout_np." * commit '5c057d44e5869b8acb779d48a4b821859040d9c8': Remove use of pthread_mutex_lock_timeout_np.