tree 9b9d16dfaded74da356597889544b8575cea3307
parent 32e4344a20c4f9c9323061aaef96678c098d6200
parent 8dc2ca68c1ccf1570caec3e52c2671b323cf7102
author Huy Nguyen <huynguyen@google.com> 1395277978 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395277978 +0000

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.