tree aa005e7898d45a45beb82bc2f1c78b751d34bb5d
parent f85abda8c964d57c315afad9cc3c70384e5ce79f
author epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> 1332440406 +0000
committer epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> 1332440406 +0000

landing patch from http://codereview.appspot.com/5874051/

git-svn-id: http://skia.googlecode.com/svn/trunk@3468 2bbb7eff-a529-9590-31e7-b0007b416f81