tree 93c0170f8c9b98ca7bb73055eb8b5ceeeff1ba5f
parent 8d31934148301b449d1b6277e25a6c3a8d162dff
parent 56f8c6c42dab4c3636edb62162088e5d765fa956
author Greg Hackmann <ghackmann@google.com> 1424912823 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424912823 +0000

am 56f8c6c4: Merge "Error compiling waitforvsync.cpp"

* commit '56f8c6c42dab4c3636edb62162088e5d765fa956':
  Error compiling waitforvsync.cpp