OSDN Git Service

am 08c2c99e: (-s ours) am ec8345a1: When the launcher is paused and we reload stuff...
authorJoe Onorato <joeo@android.com>
Wed, 27 Oct 2010 20:19:07 +0000 (13:19 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 27 Oct 2010 20:19:07 +0000 (13:19 -0700)

Trivial merge