tree 473e2f23acbbc02fdb6fd345ea8bff8ee23083a6
parent 0e27ebef5b54b6ac2e57c29da5791e6539535e98
parent b6ccd36ac05debadbe1b0e2749ca7c830c362d64
author Bjorn Bringert <bringert@google.com> 1382459870 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382459870 -0700

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

* commit 'b6ccd36ac05debadbe1b0e2749ca7c830c362d64':
  Fix ConcurrentModificationException in InstallShortcutReceiver