| commit | e714eb157ea92f3166b6292ed54138f3e092d5da | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Aug 16 12:25:58 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 16 12:25:58 2013 -0700 |
| tree | bb662ba56ddd2e6d90c22675e7a8e5296d616585 | |
| parent | 4ff3ec05dfbec3029b5656868b643f812bec2853 [diff] | |
| parent | 6b6aaec892b1f256787fbbf106449f7d7e5888a2 [diff] |
am 6b6aaec8: am 4eacb341: Merge "Fix pthread_getcpuclockid." * commit '6b6aaec892b1f256787fbbf106449f7d7e5888a2': Fix pthread_getcpuclockid.