| commit | efaf2c857aac326df2051ac2c419be26bd3d5a6f | [log] [tgz] |
|---|---|---|
| author | Huy Nguyen <huynguyen@google.com> | Thu Mar 20 16:37:40 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 20 16:37:40 2014 +0000 |
| tree | 17361014862ef4c3493ce3e3c93ea474ddf1553f | |
| parent | 16880deb08a89ed5cf7e9453f9391ec5c3ce9bce [diff] | |
| parent | e35f8e2cacdb44284014b8c7bc688fac9859f632 [diff] |
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.