tree cba62d0d64153aa2169651696bc238591341d679
parent 1dfe7e3ad089cd293c8613559a57b02a0147cc77
parent b6bfb739727143dbf2eaf0ef427df49d8999f111
author Bjorn Bringert <bringert@google.com> 1414085365 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085365 +0000

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

* commit 'b6bfb739727143dbf2eaf0ef427df49d8999f111':