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

* commit 'b6ccd36ac05debadbe1b0e2749ca7c830c362d64':
  Fix ConcurrentModificationException in InstallShortcutReceiver