tree 5a81d34ffb64b0d103510645d661f9e3d04db82b
parent d822fbec460b79bdad7fb33563d85094bdd606fc
parent 3e297b57a0cb06450034a80893b5ede223b33552
author Daniel Sandler <dsandler@android.com> 1274815048 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274815048 -0700

am 3e297b57: Merge "Mask bitmap creation errors while dragging shortcuts." into froyo