tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 196aa423ca9a87a7ae9946eb4098693b8cb560e1
parent 011639a83e46908134416a8f7e1686dc7852d17d
author Sunny Goyal <sunnygoyal@google.com> 1422685355 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685355 +0000

am 011639a8: am 8b5274e7: am 4824965f: am 16fe1dfd: Merge "Updating shourcuts only when the corresponding user also matches the AppInfo" into ub-now-porkchop

* commit '011639a83e46908134416a8f7e1686dc7852d17d':