tree 949100b22660e561ed4d24d2f1fc6f5215136a5a
parent 1041107737175c96e2d9a0ae6be6d5f6a94574d3
parent bfbd52a5e618a86dc7a13bb5e4866759e181a7cb
author Dan Sandler <dsandler@android.com> 1394226742 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394226742 +0000

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

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