am fee39c01: 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 'fee39c019284a614036bf9e035942747cd5bcb7e':
  Fix contact tile horizontal animations when swiping shortcut card DO NOT MERGE
tree: ff8f13edbe71f7cfbe12296f2cf14814833c4fe2
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags