tree 0771dc23b469606b7140108091973ffa65b6d1c0
parent 7727179cd92caa992def57947c5772447a060e36
parent 7f83b228353ff2af5ef8d48ad48fdd4082f67aa3
author Chris Wren <cwren@android.com> 1396405970 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396405970 +0000

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

* commit '7f83b228353ff2af5ef8d48ad48fdd4082f67aa3':
  update strings for welcome back