tree b80798e8caff818144f927dfd45c31ff88375868
parent bc60df98c957523db0f9e72ce41da1262af95673
parent 16fe1dfd30ee44be2c7c7f67b680afce875a3c3d
author Sunny Goyal <sunnygoyal@google.com> 1410986786 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410986786 +0000

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

* commit '16fe1dfd30ee44be2c7c7f67b680afce875a3c3d':
  Updating shourcuts only when the corresponding user also matches the AppInfo