satok cc6131053f Merge remote-tracking branch 'goog/master' into deldebug ... Conflicts: java/res/xml/prefs.xml Change-Id: Id09bebfe996f0c6a4b906e7225a6d0ac0d01a9a1		2011-04-07 12:57:10 +09:00
..
compat	Merge remote-tracking branch 'goog/master' into merge	2011-04-01 18:14:26 +09:00
deprecated	Enable VoiceInput even if there is no shortcut subtype supported	2011-04-01 16:12:06 +09:00
keyboard	Move a debug utility function to EditorInfoCompatUtils	2011-03-25 12:56:57 -07:00
latin	Merge remote-tracking branch 'goog/master' into deldebug	2011-04-07 12:57:10 +09:00