tree c922c4a419a495c1a139264d1b98f4050c3f26d1
parent ab37038de0d63310a70cca9bfaa0082d9787bedf
parent a6b8189f8e152caafe5900cff0f068517a70088d
author Craig Mautner <cmautner@google.com> 1340330450 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340330450 -0700

am a6b8189f: am 9ce1ea3a: Merge "Fix starting window problems." into jb-dev

* commit 'a6b8189f8e152caafe5900cff0f068517a70088d':
  Fix starting window problems.