tree fb1745879c5acaa3efbf86e28662a3e2ef0a2a8e
parent c44706064341f02a14d61091492a5fc6dc6efd2d
parent 75fd1ec46da7708bd46183da7999ec891d63140d
author Joe Onorato <joeo@android.com> 1266542104 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1266542104 -0800

am 75fd1ec4: DO NOT MERGE - Use the froyo launcher2 in mr3, except for a few unbundling things that can\'t be merged back.

Merge commit '75fd1ec46da7708bd46183da7999ec891d63140d' into eclair-plus-aosp

* commit '75fd1ec46da7708bd46183da7999ec891d63140d':
  DO NOT MERGE - Use the froyo launcher2 in mr3, except for a few unbundling things that can't be merged back.