tree 8067cb3e804339e5cb879e880284817a449f831d
parent 97a9341ee366c0f9af71b7e7a4e71900774f0dd8
parent 1a27e62a7d611b9981847b13d6617ff2cb4b4a37
author Yorke Lee <yorkelee@google.com> 1394153426 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394153426 +0000

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 '1a27e62a7d611b9981847b13d6617ff2cb4b4a37':
  Fix contact tile horizontal animations when swiping shortcut card DO NOT MERGE