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