tree 6cfc9a33852c24b32942c731d11e3ac7959979f3
parent c27ee87c8da93b6d609be1be18eaa0f0c7d07e98
parent 8c1c7cfacd82a174c65fcbf839d7037e3692aee8
author Billy Hewlett <billyh@google.com> 1340293615 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340293615 -0700

am 8c1c7cfa: Cherrypick change to skia

* commit '8c1c7cfacd82a174c65fcbf839d7037e3692aee8':
  Cherrypick change to skia