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
..
res	Merge remote-tracking branch 'goog/master' into mergescriptpackage	2012-08-06 16:04:07 +09:00
src/com/android/inputmethod	am 76bfe7f7: am 44f12ed9: Merge "Separate updateSuggestionStrip from commitTyped" into jb-mr1-dev	2012-08-05 22:49:27 -07:00
Android.mk	Just a cosmetic cleanup	2012-07-28 21:24:29 +09:00
AndroidManifest.xml	Merge "Add a <uses-sdk> element in the LatinIME's manifest" into jb-mr1-dev	2012-07-31 00:12:37 -07:00
MODULE_LICENSE_APACHE2
NOTICE
proguard.flags	Rename LatinKeyboardView to MainKeyboardView	2012-07-23 12:11:43 +09:00