tree 51cd24518b1e35875755d3f2a1b01d969afbd2d2
parent 4368175d4ee8c36c37bcb8c2568b82e759524261
parent 8e660c4d19de4704261b06256b87ee851695813d
author Yorke Lee <yorkelee@google.com> 1398862462 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398862462 +0000

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

* commit '8e660c4d19de4704261b06256b87ee851695813d':