tree cba62d0d64153aa2169651696bc238591341d679
parent db90cb6081509e13428534170cf714727550fe1a
parent 27414260a7724290364c149fe3d0c3a153ae9662
author Bjorn Bringert <bringert@google.com> 1414085110 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085110 +0000

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

* commit '27414260a7724290364c149fe3d0c3a153ae9662':