tree b8552c171875e9032f2cc83490eab661fbc8c495
parent 485d3730042381ed203e312ad70fec9cb0d2d934
parent d80268ba19f9217c5459a2952580090ef84a7b78
author Mark Salyzyn <salyzyn@google.com> 1424704799 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424704799 +0000

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

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