tree f810ee88137ed419aad72e1a289e5022ec40994d
parent 80a603f77d7df6d742131db7a848f06e0a762569
parent 235a50e0d1a303e586c36bc5e70d560b8b924d58
author Bjorn Bringert <bringert@google.com> 1382026841 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382026841 -0700

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

* commit '235a50e0d1a303e586c36bc5e70d560b8b924d58':
  Fix ConcurrentModificationException in InstallShortcutReceiver