tree 89011ab02b5484598c6de0a86ecd01a03962864f
parent a915a917a2d80a076030cf90791d607cf67a250c
parent 08c2c99e74b424cc3efe98f62a9c9abc90200ce3
author Joe Onorato <joeo@android.com> 1288210747 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1288210747 -0700

am 08c2c99e: (-s ours) am ec8345a1: When the launcher is paused and we reload stuff in the background, we need to re-re-load it in onResume.