Updated to work with Android 2.7.0.