Ken Wakasa 64176158e7 resolved conflicts for merge of 75513e51 to master ... Change-Id: I058c3e63e5e349b58b2bdd2723cb43fbc24a0425		2014-09-13 10:41:19 +09:00
..
res	am c24340f9: am 74d59cca: am dc1097ee: Merge "Update AOSP launcher icon" into lmp-dev	2014-09-12 19:16:40 +00:00
src/com/android/inputmethod	resolved conflicts for merge of 75513e51 to master	2014-09-13 10:41:19 +09:00
Android.mk
AndroidManifest.xml	Clear keyboard cache when system locale is changed	2014-08-28 22:50:07 +09:00
MODULE_LICENSE_APACHE2
NOTICE
proguard.flags