Jatin Matani 0dacfff5d1 resolved conflicts for merge of d711426a to mnc-dr-dev ... Change-Id: I2113be7af0f4abe0816c6985b394a73395206c2d		2015-07-13 03:01:27 -07:00
..
res	am 8c2591ee: Bring back shortcuts and add to dictionary UI	2015-07-11 02:28:19 +00:00
src/com/android/inputmethod	resolved conflicts for merge of d711426a to mnc-dr-dev	2015-07-13 03:01:27 -07:00
Android.mk
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