Jean Chalard a19c5e6380 resolved conflicts for merge of be82f297 to master ... Change-Id: If49ca384ea0ac415a75f8ea1bad77dc6719cb04d		2012-06-15 09:03:52 +09:00
..
res	Merge "Import translations. DO NOT MERGE"	2012-06-14 14:54:04 -07:00
src/com/android/inputmethod	resolved conflicts for merge of be82f297 to master	2012-06-15 09:03:52 +09:00
Android.mk
AndroidManifest.xml	Use splitActionBarWhenNarrow for Android Settings activity	2012-05-22 16:10:11 +09:00
MODULE_LICENSE_APACHE2
NOTICE
proguard.flags	am 09abb2c7: am 2866da88: Make ProximityInfo copy constructor for test	2012-05-23 02:54:57 -07:00