tree 0771dc23b469606b7140108091973ffa65b6d1c0
parent 1c7d12a9d0b46577a47893b28e779f3c87353194
parent 2204dc6b63b9e0c681c7280364263dfcbcb3a7bf
author Chris Wren <cwren@android.com> 1396406133 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396406133 +0000

am 2204dc6b: am 7f83b228: Merge "update strings for welcome back" into ub-now-mister-ugly

* commit '2204dc6b63b9e0c681c7280364263dfcbcb3a7bf':
  update strings for welcome back