tree e007750049412de572f57bc5da401d463b7ea3ac
parent 8de1417ce577c8b7960dc170cde5a74827bf94ec
parent 134cb7daca37731a3361e7876af892070b6fde26
author Adam Cohen <adamcohen@google.com> 1397070043 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397070043 +0000

am 134cb7da: 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 '134cb7daca37731a3361e7876af892070b6fde26':
  Ensure the intro view is always the top view in the draglayer if it is present