tree 10da860fcff71886af91d082e31f0e1917926848
parent f76eb724fe07bd2ef8a9d91f8912e49acd5774cb
parent 7a20d40ffeb7615efff22f75c44153e6502cf40c
author Bjorn Bringert <bringert@google.com> 1414566064 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566064 +0000

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

* commit '7a20d40ffeb7615efff22f75c44153e6502cf40c':