tree 22acdea33d83ccda22b321466e3dfa15cab050f0
parent 6c9db19d8ccaf5f451f17be0cb69b9478bbecde6
parent 9a60d5484fbb730a2de6f905385935b44cc365bf
author Daniel Sandler <dsandler@google.com> 1255372887 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255372887 -0700

am 9a60d548: Pull over new icons from Launcher to Launcher2.

Merge commit '9a60d5484fbb730a2de6f905385935b44cc365bf'

* commit '9a60d5484fbb730a2de6f905385935b44cc365bf':
  Pull over new icons from Launcher to Launcher2.