OSDN Git Service

am d76403d6: am cdf8fe86: am 20e45a8e: Merge "Do not allow duplicate shortcuts when...
authorNilesh Agrawal <nileshagrawal@google.com>
Thu, 23 Oct 2014 17:32:33 +0000 (17:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Oct 2014 17:32:33 +0000 (17:32 +0000)
* commit 'd76403d698751cd2505812ab7230c1e4fa5163e9':


Trivial merge