tree c272dc84136d63138c0fa627bc451907be691632
parent 4aa48aedda0a8f945efbc94f1f5beb355d1c6060
parent 7b2114a4283ccd90a937b14145c11125824cd1bd
author Tadashi G. Takaoka <takaoka@google.com> 1367379487 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367379487 -0700

am 7b2114a4: Display still image when device can\'t play welcome video

* commit '7b2114a4283ccd90a937b14145c11125824cd1bd':
  Display still image when device can't play welcome video