tree 5b60e0272dd5340ffdd304f647816d54a5692e96
parent ebdb34f3cd954f733b252c7cc975a7016abb43ef
parent 2e9eb2a6a0995aa94248b9b230fefc92feec6b1f
author Sunny Goyal <sunnygoyal@google.com> 1411150558 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411150558 +0000

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

* commit '2e9eb2a6a0995aa94248b9b230fefc92feec6b1f':
  Fix: First run cling shoud show 'Welcome' when there is no migration cling