tree cba62d0d64153aa2169651696bc238591341d679
parent 10383e2992c0f23f1b10ddc31ef9d6d9d36129ca
parent 76fd2e70bd28668a09edd1e7bb30348b6536b5ad
author Qiwen Zhao <zhao@google.com> 1414092451 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414092451 +0000

am 76fd2e70: Merge branch \'klp-dev-plus-aosp\' of sso://googleplex-android.git.corp.google.com/a/platform/packages/apps/Launcher3 into klp-dev-plus-aosp

* commit '76fd2e70bd28668a09edd1e7bb30348b6536b5ad':