tree 10da860fcff71886af91d082e31f0e1917926848
parent ecbb0a5cec10a1b91fb4cdad0a62d7c7b01e9358
parent a42634a571557f0826c519488a8c53c784abb952
author Qiwen Zhao <zhao@google.com> 1414566469 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566469 +0000

am a42634a5: 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 'a42634a571557f0826c519488a8c53c784abb952':