tree f855359ea32e87c5c522c76dd32485e23d374ce0
parent 9886c449fc17405d20f8659aad6b935a13cd6514
parent 14dd85305e2d4ed74f21ce6b4f08fd1887cb8256
author Joe Onorato <joeo@android.com> 1257185452 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257185452 -0800

am 14dd8530: am 080d9b61: Adjust logging of launcher2 launch times, and make all apps loading wait a little longer, even though usually it happens later anyway.

Merge commit '14dd85305e2d4ed74f21ce6b4f08fd1887cb8256' into eclair-mr2-plus-aosp

* commit '14dd85305e2d4ed74f21ce6b4f08fd1887cb8256':
  Adjust logging of launcher2 launch times, and make all apps loading wait a little longer,