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
tree: 025e1248ffedb5243226d4c2fee22b92bc4dc633
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags