satok 80a9ce76d8 Merge remote-tracking branch 'goog/master' into merge ... Conflicts: java/res/xml/method.xml Change-Id: I7b5f2232753d7159b520e5e57a0e06c51935edbd		2011-06-24 18:38:41 +09:00
..
background_voice.xml	Change the UI of Voice IME to be more like Voice Search.	2011-01-18 15:49:17 +00:00
btn_candidate.xml	Fix suggestion strip layout	2011-04-08 20:03:57 +09:00
btn_candidate_ics.xml	New IceCreamSandwich assets and theme	2011-06-23 21:06:17 +09:00
btn_center.xml	Merge remote branch 'goog/master' into merge	2011-01-19 20:33:55 +09:00
btn_keyboard_key.xml	Don't let the native code target be included twice when unbundling.	2010-03-09 15:01:09 -08:00
btn_keyboard_key3.xml	DO NOT MERGE. Backport LatinIME from master to Gingerbread	2010-08-20 14:37:03 +09:00
btn_keyboard_key_fulltrans.xml	Don't let the native code target be included twice when unbundling.	2010-03-09 15:01:09 -08:00
btn_keyboard_key_gingerbread.xml	Change background color for functional keys in LatinIME	2010-09-02 11:47:33 +09:00
btn_keyboard_key_ics.xml	New IceCreamSandwich assets and theme	2011-06-23 21:06:17 +09:00
btn_keyboard_key_popup.xml	Use custom theme for Keyboard theme switch	2011-05-25 18:59:00 +09:00
btn_keyboard_key_popup_ics.xml	New IceCreamSandwich assets and theme	2011-06-23 21:06:17 +09:00
btn_keyboard_key_stone.xml	Remove colorScheme attribute from KeyboardView	2011-06-22 22:45:03 +09:00
keyboard_key_feedback.xml	DO NOT MERGE. Backport LatinIME from master to Gingerbread	2010-08-20 14:37:03 +09:00
keyboard_key_feedback_ics.xml	New IceCreamSandwich assets and theme	2011-06-23 21:06:17 +09:00