tree cba62d0d64153aa2169651696bc238591341d679
parent fc6dab311751300cde3031626d3dbacfd15614fc
parent d76403d698751cd2505812ab7230c1e4fa5163e9
author Nilesh Agrawal <nileshagrawal@google.com> 1414085553 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085553 +0000

am d76403d6: am cdf8fe86: am 20e45a8e: Merge "Do not allow duplicate shortcuts when ALL_APPS is disabled." into jb-ub-now-kermit

* commit 'd76403d698751cd2505812ab7230c1e4fa5163e9':