Qiwen Zhao dc8d416578 Merge commit 'f6eebb21' into master-nova ...

Conflicts:
	core/java/android/view/GLES20Layer.java
	core/jni/android_view_GLES20Canvas.cpp

2014-02-11 10:25:59 -08:00

..

java/android/graphics

Merge commit 'f6eebb21' into master-nova

2014-02-11 10:25:59 -08:00

tests/graphicstests

Preserve fill type in Path.reset().

2013-10-07 21:04:47 +00:00