tree c028bfe537607823c37e2ffc8c713c73059d3130
parent f3847c7d069ef1907f5ab6868a756e8eadc0409f
parent 4d70e266a580f3acc1cc1f1722357a99a38778bb
author Sunny Goyal <sunnygoyal@google.com> 1422685362 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685362 +0000

am 4d70e266: am b9fd1ef3: am 2e9eb2a6: am 92e97dcc: Merge "Fix: First run cling shoud show \'Welcome\' when there is no migration cling" into ub-now-porkchop

* commit '4d70e266a580f3acc1cc1f1722357a99a38778bb':