tree 18006cbb433a05cd4c1545d16a88c18cf7b27dc8
parent 956b61b8844b3166b5d8e2ebf5ba94ddc233a808
parent a8a62569d6b1f898143fc1dbcc47a1f3c3131fd4
author Winson Chung <winsonc@google.com> 1392411610 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411610 +0000

am a8a62569: 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 'a8a62569d6b1f898143fc1dbcc47a1f3c3131fd4':
  Ensuring that we have a valid name for installed shortcuts. (Bug 11266005)