tree e9d0690dad0c82152b5a7b64c89c59791d79c7d9
parent 3d2fefae6de81055952b815b872ff5d7d5c34c0a
parent dff0bfeb901e767ca9b57f9b8051c7fd077626e9
author Nilesh Agrawal <nileshagrawal@google.com> 1387323973 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1387323973 +0000

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