tree be3c9694082a4bdbd91aea41232df36b3c4c3ebf
parent fbfbaf198006bfaa7347f3a3ea76e51cb30079ba
parent c3e4f0a72baff805b434fd6b24cb29b3dc68e98d
author Romain Guy <romainguy@google.com> 1343432679 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343432679 -0700

am c3e4f0a7: Merge "Rename drawGeneralText to drawText" into jb-mr1-dev

* commit 'c3e4f0a72baff805b434fd6b24cb29b3dc68e98d':
  Rename drawGeneralText to drawText