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