am 02ed630a: am b6bfb739: am bdaff6fb: am 0942bf8e: am 9933a5eb: am 235a50e0: Merge "Fix ConcurrentModificationException in InstallShortcutReceiver" into jb-ub-now-indigo-rose

* commit '02ed630a672fa97e331fbb7aef5faee478046736':