tree 20a489c52584bdc7b77397e9771e33723ba9dd8e
parent 797d18895b8deb439f6e4d7f027ba211bbd4d54d
parent 20e45a8ef819bbb9d628176803268bb3c8aba09a
author Nilesh Agrawal <nileshagrawal@google.com> 1387324072 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1387324072 -0800

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

* commit '20e45a8ef819bbb9d628176803268bb3c8aba09a':
  Do not allow duplicate shortcuts when ALL_APPS is disabled.