tree e1d2a1ecb78e2324c9125c4b57a69446de367abc
parent 9e8e38a8d79f3f5157464154e0f8ea3d9338946d
parent 1fa05179eb4ccbe264c67b6acb3abf2793b03197
author Winson Chung <winsonc@google.com> 1382042772 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382042772 -0700

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

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