tree bd6de6559bdf6df305211b1a184b0f8ed1c5347e
parent fa80ffa4fdd8feead2dfaeffb1c06f3ba2806d36
parent ab99b39d7d152de35ea02a364190ff325da4015b
author Victoria Lease <violets@google.com> 1379701206 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379701206 -0700

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

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