tree aafe5001aa0397dd0e39b60b6186ed22f168449b
parent 94befd1be9b3a19fb2dda8badebb373806cb311c
author Eric Fischer <> 1238202252 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1238202252 -0700

AI 143314: am: CL 143165 am: CL 142861 Make TextView Emoji scale to match the size of the text.
  Original author: enf
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143314