am 2fb1398d: am 2aacd7b5: Merge "Fix bug in SwipeHelper" into klp-dev

* commit '2fb1398d02d09ec3c1a92f49681a54fa4a175505':
  Fix bug in SwipeHelper
tree: 0919abca4a94b9e7159acd658e12c6617bfc6e95
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags