tree 10da860fcff71886af91d082e31f0e1917926848
parent 9a00802cb4ac027bdc7e99125a85a66cb8f023bb
parent a4d76872864ef85a13ecda69938d907cc010d1fc
author Winson Chung <winsonc@google.com> 1414566293 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566293 +0000

am a4d76872: 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 'a4d76872864ef85a13ecda69938d907cc010d1fc':