tree 10da860fcff71886af91d082e31f0e1917926848
parent f6b2c46c617addd38842e90e5f7255406b901e45
parent db9eca39e9cc1386b4c48300c294f0349c6d9762
author Nilesh Agrawal <nileshagrawal@google.com> 1414566447 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566447 +0000

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

* commit 'db9eca39e9cc1386b4c48300c294f0349c6d9762':