tree 25889df9d9a512dbe7d571999d8a1b9379cad4be
parent ca9ae3cbafcafbbe83c760ad939ef850def383b3
parent dba56d0812f3f769c7006b65ee27b920bc4f2672
author Michael Jurka <mikejurka@google.com> 1369093355 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369093355 -0700

am dba56d08: am 2b030fd2: Merge "Persist list of shortcuts to install on home workspace" into jb-mr2-dev

* commit 'dba56d0812f3f769c7006b65ee27b920bc4f2672':
  Persist list of shortcuts to install on home workspace