Merge remote-tracking branch 'goog/master' into merge

java/AndroidManifest.xml

java/proguard.flags

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

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

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

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

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

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

...res/drawable-hdpi/btn_keyboard_key_dark_normal_holo.9.png

.../res/drawable-hdpi/btn_keyboard_key_dark_normal_off.9.png

...drawable-hdpi/btn_keyboard_key_dark_normal_off_holo.9.png

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

.../drawable-hdpi/btn_keyboard_key_dark_normal_on_holo.9.png

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

...es/drawable-hdpi/btn_keyboard_key_dark_pressed_holo.9.png

...res/drawable-hdpi/btn_keyboard_key_dark_pressed_off.9.png

...rawable-hdpi/btn_keyboard_key_dark_pressed_off_holo.9.png

.../res/drawable-hdpi/btn_keyboard_key_dark_pressed_on.9.png

...drawable-hdpi/btn_keyboard_key_dark_pressed_on_holo.9.png

...res/drawable-hdpi/btn_keyboard_key_fulltrans_normal.9.png