am 9933a5eb: am 235a50e0: Merge "Fix ConcurrentModificationException in InstallShortcutReceiver" into jb-ub-now-indigo-rose

* commit '9933a5ebbf9b079798fb8e45d1b2f5ecbecd83ee':
  Fix ConcurrentModificationException in InstallShortcutReceiver