tree e007750049412de572f57bc5da401d463b7ea3ac
parent daeeb31ac0932f470437aa94d65f0f972d81d2f2
parent f6a47bbc05b7797a85034760b001f0050bf439a8
author Adam Cohen <adamcohen@google.com> 1397069896 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397069896 +0000

am f6a47bbc: Merge "Ensure the intro view is always the top view in the draglayer if it is present" into ub-now-mister-ugly

* commit 'f6a47bbc05b7797a85034760b001f0050bf439a8':
  Ensure the intro view is always the top view in the draglayer if it is present