tree 10da860fcff71886af91d082e31f0e1917926848
parent 28e6c85f1036a349ae8ec480937abcfd2c1f80b4
parent 02ed630a672fa97e331fbb7aef5faee478046736
author Bjorn Bringert <bringert@google.com> 1414566290 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566290 +0000

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':