Satoshi Kataoka 84bb18f4c9 resolved conflicts for merge of ee78e780 to master ... Change-Id: I88a4996bdd17c5378a67781d8075eff311670c3b		2012-06-13 06:45:38 +09:00
..
res	Merge "Adjust string lengths for translation"	2012-06-12 00:10:57 -07:00
src/com/android/inputmethod	resolved conflicts for merge of ee78e780 to master	2012-06-13 06:45:38 +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