Ken Wakasa 8ed81f9fd7 resolved conflicts for merge of 8e9385cc to master ... Change-Id: Ia6d192ee4a8496afa3f788894844ebef78fb7a8c		2014-09-13 09:25:23 +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 8e9385cc to master	2014-09-13 09:25:23 +09:00
Android.mk
AndroidManifest.xml
MODULE_LICENSE_APACHE2
NOTICE
proguard.flags