tree 8067cb3e804339e5cb879e880284817a449f831d
parent b21d78f577fffb717c3b52a83e0e54e3f4867567
parent 4315914cdfcdce1dc9c75e471e05b745e7095a28
author Yorke Lee <yorkelee@google.com> 1394153213 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394153213 +0000

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

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