tree 9ffa1cc6c1ea7342e946c8017afe1c7c3e5c5399
parent 55bd9ee7fe4d455ac7edb1f336bfcb31a6ead361
parent c57bb9b113aff1315ea4e871f09e94406cfe56e8
author Sunny Goyal <sunnygoyal@google.com> 1432247561 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432247561 +0000

am c57bb9b1: Merge "Icons are not updated to TYPE_APPLICATION during restore" into ub-launcher3-burnaby

* commit 'c57bb9b113aff1315ea4e871f09e94406cfe56e8':
  Icons are not updated to TYPE_APPLICATION during restore