Ken Wakasa 08d7f2f95a resolved conflicts for merge of b1fbd696 to jb-mr1-dev bug:6809603 ... Change-Id: I23dcf45892d94db88f424a4ee0ae440a2c743d9b		2012-09-22 01:50:33 +09:00
..
res	resolved conflicts for merge of b1fbd696 to jb-mr1-dev bug:6809603	2012-09-22 01:50:33 +09:00
src/com/android/inputmethod	Merge "Fix gesture start detection algorithm" into jb-mr1-dev	2012-09-21 01:51:57 -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	Fix JNI	2012-08-11 13:54:01 +09:00