Alan Viverette fadfbf1ae0 Merge "Add support for using ColorStateList as GradientDrawable's stroke"

2013-11-05 02:44:31 +00:00

..

java

Merge "Add support for using ColorStateList as GradientDrawable's stroke"

2013-11-05 02:44:31 +00:00

jni

resolved conflicts for merge of ed84dea9 to master

2013-10-29 14:58:16 -07:00

res

Merge "Import translations. DO NOT MERGE"

2013-11-01 14:35:14 +00:00

tests

Merge "Get rid of coretests/android.text.HtmlTest"

2013-10-23 17:35:49 +00:00