tree ec99ea08c26bf18edd60c3dd03ccac55e3082362
parent fd4862555abcc1d8aaf80ce112c2fcd9acd52ec9
parent 74b6de37e029ea5410599421c372143fa78d651b
author Andrew Hsieh <andrewhsieh@google.com> 1395371438 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395371438 +0000

am 74b6de37: am 1df09c7a: Merge "Fix build with new toolchain by adding -lpthread"

* commit '74b6de37e029ea5410599421c372143fa78d651b':
  Fix build with new toolchain by adding -lpthread