tree 26ce6b406d7c82ccffd9d0c5c576ed39a8598c78
parent cdc5bda4bf8e1747a73f43f9de7d36302e20e83f
parent 804bcbf34295090b28c5a6a374ab464ea2726349
author Adam Cohen <adamcohen@google.com> 1396279010 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396279010 +0000

am 804bcbf3: am 8440e7ce: Merge "Increase delay before dismissing intro screen (issue 13691305)" into ub-now-mister-ugly

* commit '804bcbf34295090b28c5a6a374ab464ea2726349':
  Increase delay before dismissing intro screen (issue 13691305)