tree 18006cbb433a05cd4c1545d16a88c18cf7b27dc8
parent 97dead1ee7b4aaa36f8829dfd2b40bf04a8d9457
parent c688ddbd94ef38bb7bb30e327fa3874ca38c7edb
author Winson Chung <winsonc@google.com> 1392411148 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411148 +0000

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

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