tree 10da860fcff71886af91d082e31f0e1917926848
parent bab1243e5d4c0b9432a244d2d0e97cd3db007162
parent 2e9eb2a6a0995aa94248b9b230fefc92feec6b1f
author Sunny Goyal <sunnygoyal@google.com> 1422666545 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666545 +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':