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

* commit '27414260a7724290364c149fe3d0c3a153ae9662':