tree 6d87006194f353e4365f9c0072e3a44a734d80e1
parent bdcc7d4a5dff2cf9d43a36e296f03016489596f6
parent 0942bf8e84cb55495ba382124599eb7f0c7fd119
author Bjorn Bringert <bringert@google.com> 1392410224 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410224 +0000

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

* commit '0942bf8e84cb55495ba382124599eb7f0c7fd119':