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