tree 8f0a1bd107ce3558f980866dc6a4b11bf17b0143
parent 58573ecdd201f3c678a68377f682e64ddaef0be6
parent a455ec21fa5341b8cee09eff73a9b465a6c28faa
author Mark Salyzyn <salyzyn@google.com> 1424705017 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424705017 +0000

am a455ec21: am d80268ba: Merge "vsync.cpp test is throwing error whe compiled"

* commit 'a455ec21fa5341b8cee09eff73a9b465a6c28faa':
  vsync.cpp test is throwing error whe compiled