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