am 235a50e0: Merge "Fix ConcurrentModificationException in...
am 235a50e0: Merge "Fix ConcurrentModificationException in InstallShortcutReceiver" into jb-ub-now-indigo-rose
* commit '235a50e0':
Fix ConcurrentModificationException in InstallShortcutReceiver