Android 2.x compatibility added