tree 025e1248ffedb5243226d4c2fee22b92bc4dc633
parent 16316d5df2450e081fb43d398b958a7acbb74516
parent 57a56c442caf74ffcda8a1d5d0b7aea657064bc4
author Yorke Lee <yorkelee@google.com> 1394161795 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394161795 +0000

am 57a56c44: (-s ours) 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 '57a56c442caf74ffcda8a1d5d0b7aea657064bc4':
  Fix contact tile horizontal animations when swiping shortcut card DO NOT MERGE