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

* commit '7a20d40ffeb7615efff22f75c44153e6502cf40c':