From: Huy Nguyen <huynguyen@google.com>
Date: Thu, 20 Mar 2014 01:12:58 +0000 (+0000)
Subject: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox... 
X-Git-Tag: android-x86-6.0-r1~130^2~1^2^2~2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e35f8e2cacdb44284014b8c7bc688fac9859f632;p=android-x86%2Fpackages-apps-Launcher3.git

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

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

e35f8e2cacdb44284014b8c7bc688fac9859f632