Tadashi G. Takaoka 463339f195 resolved conflicts for merge of aca5785a to master ... Change-Id: I01e8af21d6d019859da4a05995e77701a0d9c585		2014-08-11 19:34:23 +09:00
..
data
res	Rename text resources consistently	2014-03-25 13:02:09 +09:00
src/com/android/inputmethod	resolved conflicts for merge of aca5785a to master	2014-08-11 19:34:23 +09:00
Android.mk	Remove android.test.runner from tests app	2013-02-05 16:07:31 -08:00
AndroidManifest.xml	Reset to 9bd6dac470	2013-12-13 17:13:32 +09:00