tree 17361014862ef4c3493ce3e3c93ea474ddf1553f
parent 16880deb08a89ed5cf7e9453f9391ec5c3ce9bce
parent e35f8e2cacdb44284014b8c7bc688fac9859f632
author Huy Nguyen <huynguyen@google.com> 1395333460 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395333460 +0000

am e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release

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