tree d4742fdb4271ef0288ece6f4c7113f759f98665a
parent 638918a2681cff345b9e3bd5ff7b170a874125dc
parent ddc0a63d8fce1f6b78e56040d09ee208336fc7a2
author Victoria Lease <violets@google.com> 1379630989 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379630989 -0700

am ddc0a63d: Merge "fix emoji clipping in hw draw path" into klp-dev

* commit 'ddc0a63d8fce1f6b78e56040d09ee208336fc7a2':
  fix emoji clipping in hw draw path