tree 51dbea070a3328acb3003eba647fb10eedebffd9
parent 9906e784faca2cc8388a04fdc544722ea93d51be
parent 9e608c12186d308fb1711e8824901fdf931a3a96
author Dianne Hackborn <hackbod@google.com> 1340671037 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340671037 -0700

am 9e608c12: Merge "Fix issue #6381224: Initial emulator boot fails and shows a blank black screen." into jb-dev

* commit '9e608c12186d308fb1711e8824901fdf931a3a96':
  Fix issue #6381224: Initial emulator boot fails and shows a blank black screen.