tree c19d333d0665b2ade4ecfdf3e92f7bb48b69b010
parent bb6094ed3cb84397b5ed8c1020f30ca8fa37a252
parent 0fe418832ad2f2df4e80051076e205a5283c1424
author Chris Wren <cwren@android.com> 1393352685 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393352685 +0000

am 0fe41883: am 0e4a365e: Merge "use restored icon for restored app shortcuts" into ub-now-lunchbox

* commit '0fe418832ad2f2df4e80051076e205a5283c1424':
  use restored icon for restored app shortcuts