tree 05ad9386d1401d911e7c110ac51a20efc5d4dd7f
parent 9b4d5a425be9f641076f32da863b04e009de1922
parent cdf8fe869862fc0ae4d03a90c32d0ddf009d63e4
author Nilesh Agrawal <nileshagrawal@google.com> 1392411285 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411285 +0000

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

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