tree 05ad9386d1401d911e7c110ac51a20efc5d4dd7f
parent 2a4bc46f3c281a2f7083cda305f2dca96379e5e6
parent d76403d698751cd2505812ab7230c1e4fa5163e9
author Nilesh Agrawal <nileshagrawal@google.com> 1392411768 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411768 +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':
  Do not allow duplicate shortcuts when ALL_APPS is disabled.