futokb/java/res/values
Satoshi Kataoka 44456dcbf2 Merge remote-tracking branch 'goog/master' into mergescriptpackage
Conflicts:
	java/res/values-af/strings.xml
	java/res/values-cs/strings.xml
	java/res/values-et/strings.xml
	java/res/values-fi/strings.xml
	java/res/values-hi/strings.xml
	java/res/values-hr/strings.xml
	java/res/values-hu/strings.xml
	java/res/values-in/strings.xml
	java/res/values-ja/strings.xml
	java/res/values-ko/strings.xml
	java/res/values-lt/strings.xml
	java/res/values-lv/strings.xml
	java/res/values-ms/strings.xml
	java/res/values-pt/strings.xml
	java/res/values-ro/strings.xml
	java/res/values-ru/strings.xml
	java/res/values-sk/strings.xml
	java/res/values-sl/strings.xml
	java/res/values-sr/strings.xml
	java/res/values-sw/strings.xml
	java/res/values-tr/strings.xml
	java/res/values-vi/strings.xml
	java/res/values-zh-rCN/strings.xml
	java/res/values-zh-rTW/strings.xml

Change-Id: Ib4141aca0b35148d62d22d4f32309f890c84303a
2012-08-06 16:04:07 +09:00
..
attrs.xml Move gesture preview parameters to KeyboardView attributes 2012-07-30 20:10:48 +09:00
bools.xml
config.xml Add device form factor to KeyboardId 2012-07-30 15:33:17 +09:00
dimens.xml Move gesture preview parameters to KeyboardView attributes 2012-07-30 20:10:48 +09:00
donottranslate.xml
gesture-input.xml
keyboard-heights.xml
keyboard-icons-black.xml
keyboard-icons-ics.xml
keyboard-icons-white.xml
keypress-vibration-durations.xml
keypress-volumes.xml
phantom_sudden_move_event_device_list.xml
predefined-subtypes.xml
strings-appname.xml
strings.xml Merge remote-tracking branch 'goog/master' into mergescriptpackage 2012-08-06 16:04:07 +09:00
styles.xml Move gesture preview parameters to KeyboardView attributes 2012-07-30 20:10:48 +09:00
sudden-jumping-touch-event-device-list.xml
themes-basic-highcontrast.xml Rename SuggestionsView to SuggestionStripView 2012-07-23 15:37:43 +09:00
themes-basic.xml Rename SuggestionsView to SuggestionStripView 2012-07-23 15:37:43 +09:00
themes-gingerbread.xml Rename SuggestionsView to SuggestionStripView 2012-07-23 15:37:43 +09:00
themes-ics.xml Rename SuggestionsView to SuggestionStripView 2012-07-23 15:37:43 +09:00
themes-stone-bold.xml Rename SuggestionsView to SuggestionStripView 2012-07-23 15:37:43 +09:00
themes-stone.xml Rename SuggestionsView to SuggestionStripView 2012-07-23 15:37:43 +09:00
touch-position-correction.xml
urls.xml
whitelist.xml