tree 3e01a23b6ec062f21307afc5127e4a4fb1024dff
parent 65301b1443804099de1e5165d98a0506682df5cb
parent 20e45a8ef819bbb9d628176803268bb3c8aba09a
author Nilesh Agrawal <nileshagrawal@google.com> 1392410329 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410329 +0000

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.