tree b2290c6fc5a9dba0648036b50ed9f10a47eea334
parent 44a59b246406d3b999a60339bcf6b96ff13067ba
parent 6f7ea1750439c37115758dec270983f34a882d11
author Gilles Debunne <debunne@google.com> 1321380135 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321380135 -0800

am 8a440477: Merge "Clean-up in TextView" into ics-mr1

* commit '8a440477fd203d74b73b32dc2b357f07dfc36067':
  Clean-up in TextView