tree 9153586f40d0144c3a2c89abf393e7a4eba0ab22
parent 7c25e4bdaa8a93b73c7b79c2ccda4494c671b767
parent 9392a75d0493fc9aacbb1e6e63518b0fa66cc3b9
author Joe Onorato <joeo@android.com> 1253206436 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1253206436 -0700

am 9392a75d: Add support for the text burn in all apps, but leave it turned off. It doesn\'t look good right now, without the proper blending.

Merge commit '9392a75d0493fc9aacbb1e6e63518b0fa66cc3b9'

* commit '9392a75d0493fc9aacbb1e6e63518b0fa66cc3b9':
  Add support for the text burn in all apps, but leave it turned off.