tree 0771dc23b469606b7140108091973ffa65b6d1c0
parent dcb173d0e348c23d967bb0939e63b6ce4e1bd503
parent c6e7d9e9175a98c4052c6b9ee896948720a005c3
author Chris Wren <cwren@android.com> 1396405690 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1396405691 +0000

Merge "update strings for welcome back" into ub-now-mister-ugly