Tadashi G. Takaoka 463339f195 resolved conflicts for merge of aca5785a to master ... Change-Id: I01e8af21d6d019859da4a05995e77701a0d9c585		2014-08-11 19:34:23 +09:00
..
res	resolved conflicts for merge of aca5785a to master	2014-08-11 19:34:23 +09:00
src/com/android/inputmethod	Fix Tamil keyboard	2014-08-11 18:07:27 +09:00
Android.mk	[HW7.5] Introduce the @Nonnull annotation (take 2)	2014-07-30 04:13:58 +00:00
AndroidManifest.xml	Remove unnecessary DebugSettingsActivity, use fragment directly	2014-07-23 17:09:46 -07:00
MODULE_LICENSE_APACHE2
NOTICE
proguard.flags