tree 404070b9995345564322f7f231e99f32f55f77a8
parent 700619e73eef4d9a08e34a48e95b6047e056d6fc
parent 453c6a781de3dc728212d66f1ca7fda2ae984974
author Mark Salyzyn <salyzyn@google.com> 1424705422 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424705422 +0000

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

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