tree fea8262b6a42bc41e5a84a65a4858ca37ecd0c21
parent c83245be678608533ce53005f4149719f6dd5e03
parent 2c9f86aa21b8d7ea6a77eaca9a49ccdb31245129
author John Reck <jreck@google.com> 1421285990 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421285990 +0000

am 2c9f86aa: am 53af1cd3: Merge "Vsyncs are hard" into lmp-mr1-dev

* commit '2c9f86aa21b8d7ea6a77eaca9a49ccdb31245129':
  Vsyncs are hard