Nick Kralevich 7668e78601 resolved conflicts for merge of 3bae94d7 to master ...

Change-Id: I381539b1494447d62290c492f2550840fe0b559c

2014-12-10 11:03:40 -08:00

..

java/android/graphics

resolved conflicts for merge of 3bae94d7 to master

2014-12-10 11:03:40 -08:00

tests/graphicstests

Preserve fill type in Path.reset().

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