tree 10da860fcff71886af91d082e31f0e1917926848
parent 32c210b7eeb8c3fb6699b9ac1e10b888227de1d5
parent 7c938d99a5e6a474bf40ef310d94c9582bc91787
author Adam Cohen <adamcohen@google.com> 1422666508 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666508 +0000

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

* commit '7c938d99a5e6a474bf40ef310d94c9582bc91787':