tree c3f7b6bda200951ea4adfdde8bd41a58bcf2664a
parent 0f3e20658a2386b68f23c71a83e18b9423e939e9
parent 6b524fe0b23cb698154896415290eef94f4b7ae5
author Qiwen Zhao <zhao@google.com> 1392423781 -0800
committer Qiwen Zhao <zhao@google.com> 1392423781 -0800

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