tree 26ce6b406d7c82ccffd9d0c5c576ed39a8598c78
parent dc493591f8917822f8f991e849e8e9eba5e65356
parent 8440e7ce17a3d54254217c69982c2ec2937ba4ba
author Adam Cohen <adamcohen@google.com> 1396278850 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396278850 +0000

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

* commit '8440e7ce17a3d54254217c69982c2ec2937ba4ba':
  Increase delay before dismissing intro screen (issue 13691305)