Jatin Matani c96aef2283 resolved conflicts for merge of d711426a to mnc-dev-plus-aosp ... Change-Id: I3d92549eb41e4f28d141bb1c218e56a8075edb1f		2015-07-11 00:01:30 -07:00
..
res	am 8c2591ee: Bring back shortcuts and add to dictionary UI	2015-07-11 02:28:11 +00:00
src/com/android/inputmethod	resolved conflicts for merge of d711426a to mnc-dev-plus-aosp	2015-07-11 00:01:30 -07:00
Android.mk	Just tiny cosmetic fixes in makefile	2014-11-11 03:26:38 +09:00
AndroidManifest.xml	Revert "Declare that LatinIME does not use cleartext network traffic."	2015-04-06 15:32:19 +00:00
MODULE_LICENSE_APACHE2
NOTICE
proguard.flags	Create a new KeyboardLayout class to represent the layout.	2015-01-30 17:24:09 -08:00