tree 2fd44eb4989099a92c0b6a90b796236d732fdaf5
parent c783ebc13a350f3f83dbe0713af9581e39b355ec
parent e0845e86299a35f84ad63177047745de5a6020e9
author Matthew Bouyack <mbouyack@google.com> 1452638413 +0000
committer android-build-merger <android-build-merger@google.com> 1452638413 +0000

Merge "In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments." into cw-e-dev am: eebf168e43
am: e0845e8629

* commit 'e0845e86299a35f84ad63177047745de5a6020e9':
  In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments.