tree 5bb05d015f39fe101714afd46743fcf7cb36a49b
parent 3e1897b3a73d1f2d5971620444dfff97e680ec85
parent 55f77f983afeffd2240ccd24d783e6d8d3ab44fd
author Adam Cohen <adamcohen@google.com> 1410275273 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410275273 +0000

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

* commit '55f77f983afeffd2240ccd24d783e6d8d3ab44fd':
  Showing clings only after the intro has completed