tree e066cd421c94efcd6e9b391f3e80e4864263a099
parent 71e03b9979b5ee4c30daa7eb0a704ec92b38431b
parent 6d0dde01f307051ee1849481c989d9e87774b894
author Chris Wren <cwren@android.com> 1393279174 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1393279174 +0000

Merge "use restored icon for restored app shortcuts" into ub-now-lunchbox