tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent 0736b9c4c0b6df9ada82d39f4a8cf70c98849b13
parent b9fd1ef3c6f9d6cd16b7c3758e7aa037877294ea
author Sunny Goyal <sunnygoyal@google.com> 1422669733 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669733 +0000

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 'b9fd1ef3c6f9d6cd16b7c3758e7aa037877294ea':