tree cba62d0d64153aa2169651696bc238591341d679
parent 03cc73bcc72f99b6b6caeca393be85a80e203c04
parent a8a62569d6b1f898143fc1dbcc47a1f3c3131fd4
author Winson Chung <winsonc@google.com> 1414085368 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085368 +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':