Wei Wang eeb60f9473 Merge commit 'fc8d2556' into manualmerge ...

Conflicts:
	res/values/strings.xml

Change-Id: Ia2a4480d13f5afae7ecef321dadf5c4686907d99

2014-01-14 22:33:21 -08:00

..

arrays.xml

Merge "Additional captioning fonts"

2013-12-20 00:41:02 +00:00

attrs.xml

Fix APN preference style

2013-08-26 13:25:59 -07:00

bools.xml

Remove Manage Mobile Plan when config_show_mobile_plan is set to false

2013-10-23 21:29:14 +00:00

colors.xml

Set divider color for light theme

2013-09-26 16:07:52 -07:00

config.xml

Add a limit to user dictionary words length

2012-02-14 14:47:14 +09:00

dimens.xml

Adjust power control widget minWidth to occupy 4 cells.

2013-11-01 17:17:08 -07:00

donottranslate.xml

Remove Google Play specific search URIs from Settings.

2013-09-30 15:59:46 -07:00

strings.xml

Merge commit 'fc8d2556' into manualmerge

2014-01-14 22:33:21 -08:00

styles.xml

Set divider color for light theme

2013-09-26 16:07:52 -07:00

themes.xml

Set divider color for light theme

2013-09-26 16:07:52 -07:00