tree bb662ba56ddd2e6d90c22675e7a8e5296d616585
parent 4ff3ec05dfbec3029b5656868b643f812bec2853
parent 6b6aaec892b1f256787fbbf106449f7d7e5888a2
author Elliott Hughes <enh@google.com> 1376681158 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376681158 -0700

am 6b6aaec8: am 4eacb341: Merge "Fix pthread_getcpuclockid."

* commit '6b6aaec892b1f256787fbbf106449f7d7e5888a2':
  Fix pthread_getcpuclockid.