tree 8067cb3e804339e5cb879e880284817a449f831d
parent 6c9d43bb809b88f7209c8e47f840be8accf35c45
parent cf1efe4e9484a3e1f7352d832da402f806deef77
author Yorke Lee <yorkelee@google.com> 1394154051 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394154051 +0000

am cf1efe4e: am 1a27e62a: am 4315914c: (-s ours) am 0094eb8f: Merge "Fix contact tile horizontal animations when swiping shortcut card DO NOT MERGE" into klp-dev

* commit 'cf1efe4e9484a3e1f7352d832da402f806deef77':
  Fix contact tile horizontal animations when swiping shortcut card DO NOT MERGE