tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent 0859ac57e1938a5a7f4f85a4cc1e37c22d7303df
parent 8b5274e787f721a0e586e7dc7b44e40e7a47a9e0
author Sunny Goyal <sunnygoyal@google.com> 1422669726 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669726 +0000

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

* commit '8b5274e787f721a0e586e7dc7b44e40e7a47a9e0':