Elliott Hughes 812ad2265e am d937f275: am 12928a07: am 2336c4ec: Merge "Fix build." ...

* commit 'd937f2750c6edc2c1a03901605b22dad02b89147':
  Fix build.

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

..

java

resolved conflicts for merge of 3ce4f3d0 to master

2014-04-28 13:53:25 -07: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