Jatin Matani 5abefbb8d6 resolved conflicts for merge of 9cd60fe1 to mnc-dev-plus-aosp ... Change-Id: I1aad861d711170ab3dab0019d8e4ff02f058c423		2015-07-11 01:08:28 -07:00
..
res	resolved conflicts for merge of 9cd60fe1 to mnc-dev-plus-aosp	2015-07-11 01:08:28 -07:00
src/com/android/inputmethod	resolved conflicts for merge of 9cd60fe1 to mnc-dev-plus-aosp	2015-07-11 01:08:28 -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