satok 4d67480fe2 Merge remote branch 'goog/master' into mastermerge ...

Conflicts:
	java/src/com/android/inputmethod/latin/LatinIME.java

Change-Id: I8fe443f434ced0cf18b1aa86e38fb8913a5b75c2

2010-09-03 22:57:28 +09:00

..

attrs.xml

DO NOT MERGE. Backport LatinIME from master to Gingerbread

2010-08-20 14:37:03 +09:00

bools.xml

DO NOT MERGE. Backport LatinIME from master to Gingerbread

2010-08-20 14:37:03 +09:00

colors.xml

Fix new theme assets and resources

2010-09-01 17:38:50 +09:00

dimens.xml

DO NOT MERGE. Backport LatinIME from master to Gingerbread

2010-08-20 14:37:03 +09:00

donottranslate.xml

Add a number alternation to English popup mini keyboard

2010-09-02 21:06:30 +09:00

durations.xml

Don't let the native code target be included twice when unbundling.

2010-03-09 15:01:09 -08:00

keycodes.xml

Add settings button

2010-08-31 14:03:50 +09:00

strings.xml

Merge remote branch 'goog/master' into mastermerge

2010-09-03 22:57:28 +09:00

styles.xml

Decrease LatinKeyboardBaseView_keyPreviewOffset. Popup will be displayed closer to each key typed.

2010-09-02 18:07:50 +09:00