tree e32511be57bf47ec2c765b48b78ac5570de6d4c2
parent 3a539a30189f03c60019a976bd4b9095eec15208
parent 215b1c80111ccc8d42256fa8f38f3d00e0171cf2
author mindyp <mindyp@google.com> 1348638144 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348638144 -0700

am 215b1c80: The "original text" is just what we are putting in the text view, which is displaytext

* commit '215b1c80111ccc8d42256fa8f38f3d00e0171cf2':
  The "original text" is just what we are putting in the text view, which is displaytext