tree 949100b22660e561ed4d24d2f1fc6f5215136a5a
parent 3a8a8f7c2355863006208fced945f63c9bdb40b4
parent eac828e0fec7085d0d6b670d578eaaf36ae2e3ca
author Dan Sandler <dsandler@android.com> 1394226543 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1394226543 -0800

am eac828e0: Merge "Don\'t lose icons when migrating from different-sized hotseats." into ub-now-lunchbox

* commit 'eac828e0fec7085d0d6b670d578eaaf36ae2e3ca':
  Don't lose icons when migrating from different-sized hotseats.