satok e75e4463cd Merge remote-tracking branch 'goog/master' into merge
Conflicts:
	java/res/xml/method.xml
	java/res/xml/prefs.xml

Change-Id: I466a43c56ec01ddac2f8ae4f15dd3a7f8c21175d
2011-04-20 18:16:18 +09:00
..