am ed537e1b: Merge "Crossfade when drop to the position" into klp-dev

* commit 'ed537e1bdf8c2b50f710aafa2c767dde5f32070c':
  Crossfade when drop to the position
tree: 76db65bcb6ed236388f132d2545e2b46374b06bf
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags