tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 584d438db2bfc408487dbd14b467bbe30a146355
parent 32e2ff45a3e1daecbee9d04eb77c28b04e14ef86
author Adam Cohen <adamcohen@google.com> 1422685340 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685340 +0000

am 32e2ff45: am e4e11d49: am 7c938d99: am 55f77f98: Merge "Showing clings only after the intro has completed" into ub-now-porkchop

* commit '32e2ff45a3e1daecbee9d04eb77c28b04e14ef86':