Merge commit 'f2af87b39b294a197b9a7aaa611a14cfcd669a16' into gingerbread-plus-aosp * commit 'f2af87b39b294a197b9a7aaa611a14cfcd669a16': Making sure the draw time is measured.