tree f810ee88137ed419aad72e1a289e5022ec40994d
parent be3adf3673432b03c4002c61a34a2635bd3ee909
parent 9933a5ebbf9b079798fb8e45d1b2f5ecbecd83ee
author Bjorn Bringert <bringert@google.com> 1382026917 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382026917 -0700

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

* commit '9933a5ebbf9b079798fb8e45d1b2f5ecbecd83ee':
  Fix ConcurrentModificationException in InstallShortcutReceiver