tree ec3c03feb82870c58a07aa071a0d5220bfe69be0
parent 80480a9dca4471751f5d5503a2a2dbc287cf1ff5
parent bdaff6fbc44688104730b582ed1c6e48ccc62eb0
author Bjorn Bringert <bringert@google.com> 1392411146 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411146 +0000

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

* commit 'bdaff6fbc44688104730b582ed1c6e48ccc62eb0':