John Reck 1022888d33 resolved conflicts for merge of 203c8171 to master ...

Change-Id: I256397410c261fae049bae4572f132235be1c5c9

2014-12-04 16:06:34 -08:00

..

java/android/graphics

resolved conflicts for merge of 203c8171 to master

2014-12-04 16:06:34 -08:00

tests/graphicstests

Preserve fill type in Path.reset().

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