Yohei Yukawa eddfe51b38 resolved conflicts for merge of 233a2f21 to master ... Change-Id: If391cc622367dfb4448c6a5c32b82111d352d86e		2014-09-18 18:27:45 +09:00
..
res	resolved conflicts for merge of 233a2f21 to master	2014-09-18 18:27:45 +09:00
src/com/android/inputmethod	resolved conflicts for merge of 233a2f21 to master	2014-09-18 18:27:45 +09:00
Android.mk	DO NOT MERGE: Abolish source code overlay and introduce overridable src dir	2014-08-20 02:56:09 +00:00
AndroidManifest.xml	Prepare for E MR1 that is linked against L SDK	2014-09-16 20:52:16 +09:00
MODULE_LICENSE_APACHE2
NOTICE
proguard.flags	Use Java 7 diamond operator	2014-05-24 01:05:42 +09:00