tree 19156fdb7c9c49bbec17a4ca8f4ccc82b772ac96
parent 1c471f4c3bd2336baabc147f9d22fffc9a880135
parent 0e4a365e0d0220aff3cf60aa390fe9fcc05dbea1
author Chris Wren <cwren@android.com> 1393345295 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1393345295 -0800

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

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