tree fefcae67b01fa22aaf5a07834851a96b85191a05
parent 5cafbe930e61015a1e3b200669a56d1bd743b771
parent 0d166d8771413866d48aaf7e3b9baf8da3315f0c
author Winson Chung <winsonc@google.com> 1392410227 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410227 +0000

am 0d166d87: am 1fa05179: Merge "Ensuring that we have a valid name for installed shortcuts. (Bug 11266005)" into jb-ub-now-jetsonic

* commit '0d166d8771413866d48aaf7e3b9baf8da3315f0c':
  Ensuring that we have a valid name for installed shortcuts. (Bug 11266005)