tree d181f31fa9430ce51c83fe040b19943f600473ae
parent a3bd05f212a06551d8de403afbb7808189186ea3
parent 9ce1ea3aa744fdd5a63ecedd07859fb2faa6f8e1
author Craig Mautner <cmautner@google.com> 1340330339 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340330339 -0700

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

* commit '9ce1ea3aa744fdd5a63ecedd07859fb2faa6f8e1':
  Fix starting window problems.