tree 797e624df67ee1ffbf1c2df504065d7dbfcb2cd4
parent e94a3564f186af090fb975509badb91f0d94d613
parent 7c938d99a5e6a474bf40ef310d94c9582bc91787
author Adam Cohen <adamcohen@google.com> 1410561567 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410561567 +0000

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

* commit '7c938d99a5e6a474bf40ef310d94c9582bc91787':
  Showing clings only after the intro has completed