am 28bd3a54: am f2af87b3: Merge "Making sure the draw time is measured." into gingerbread

Merge commit '28bd3a54ec192ed9259cf88873e387129103258e'

* commit '28bd3a54ec192ed9259cf88873e387129103258e':
  Making sure the draw time is measured.