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
..
bools.xml	Don't let the native code target be included twice when unbundling.	2010-03-09 15:01:09 -08:00
donottranslate.xml	Don't let the native code target be included twice when unbundling.	2010-03-09 15:01:09 -08:00
strings.xml	Merge remote branch 'goog/master' into mastermerge	2010-09-03 22:57:28 +09:00