Ken Wakasa 6da1c674fd resolved conflicts for merge of 8159336b to master ... Change-Id: I9dd726593c6768b1db35305935ee69b0937358ef		2014-08-27 18:55:39 +09:00
..
res	resolved conflicts for merge of 0268f736 to master	2014-08-27 18:41:31 +09:00
src/com/android/inputmethod	resolved conflicts for merge of 8159336b to master	2014-08-27 18:55:39 +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	Remove unnecessary DebugSettingsActivity, use fragment directly	2014-07-23 17:09:46 -07:00
MODULE_LICENSE_APACHE2
NOTICE
proguard.flags	Use Java 7 diamond operator	2014-05-24 01:05:42 +09:00