tree 273d509c7c837c453d6a29b2eec34ff920a90bbc
parent 75bb1937b40d11580464557f7bb8a76ae1b805ed
parent 0d1c563125290a58a75f6476887942a62a79d136
author Joe Onorato <joeo@android.com> 1251665445 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1251665445 -0700

am 0d1c5631: show the text

Merge commit '0d1c563125290a58a75f6476887942a62a79d136'

* commit '0d1c563125290a58a75f6476887942a62a79d136':
  show the text