Adam Lesinski 1ebf4ef188 Merge "Merge commit '734a78fb' into manualmerge"

2014-04-28 21:20:01 +00:00

..

java

Merge "Merge commit '734a78fb' into manualmerge"

2014-04-28 21:20:01 +00:00

jni

Merge "Support Oval GradientDrawable outlines, and ShapeDrawable"

2014-04-26 01:59:00 +00:00

res

Make switchStyle public

2014-04-28 12:39:15 -07:00

tests

am d937f275: am 12928a07: am 2336c4ec: Merge "Fix build."

2014-04-28 21:02:17 +00:00