tree 10da860fcff71886af91d082e31f0e1917926848
parent 1bbf40131e7ce3d51de9551bbc1039b5c2863414
parent 4824965fc5b403d3ca5018f65077d953e3b80b42
author Sunny Goyal <sunnygoyal@google.com> 1422666532 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666532 +0000

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

* commit '4824965fc5b403d3ca5018f65077d953e3b80b42':