tree 473e2f23acbbc02fdb6fd345ea8bff8ee23083a6
parent dc6f6268beeaf1e9e739fb06f9c42834bdc8224e
parent 235a50e0d1a303e586c36bc5e70d560b8b924d58
author Bjorn Bringert <bringert@google.com> 1382459655 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382459655 -0700

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

* commit '235a50e0d1a303e586c36bc5e70d560b8b924d58':
  Fix ConcurrentModificationException in InstallShortcutReceiver