Merge branch 'master' of...

java/AndroidManifest.xml

java/res/drawable-hdpi/btn_keyboard_key_normal.9.png

java/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png

java/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png

java/res/drawable-hdpi/btn_keyboard_key_pressed.9.png

java/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png

java/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png

java/res/drawable-hdpi/ic_launcher_keyboard.png

java/res/drawable-hdpi/ic_subtype_mic_dark.png

.../drawable-hdpi/keyboard_key_feedback_background_klp.9.png

java/res/drawable-hdpi/sym_keyboard_settings_holo_dark.png

java/res/drawable-mdpi/btn_keyboard_key_normal.9.png

java/res/drawable-mdpi/btn_keyboard_key_normal_off.9.png

java/res/drawable-mdpi/btn_keyboard_key_normal_on.9.png

java/res/drawable-mdpi/btn_keyboard_key_pressed.9.png

java/res/drawable-mdpi/btn_keyboard_key_pressed_off.9.png

java/res/drawable-mdpi/btn_keyboard_key_pressed_on.9.png

java/res/drawable-mdpi/ic_launcher_keyboard.png

.../drawable-mdpi/keyboard_key_feedback_background_klp.9.png

java/res/drawable-mdpi/sym_keyboard_label_mic_holo_dark.png