Derek Sollenberger 86a1c30a11 Merge "Change behavior of setBitmap to cleanly reset the canvas" into oc-dev am: 7944962b7e
am: 43844db75d

Change-Id: I8e362993a2fc51ce93015924d4819884301aa0c1
2017-04-12 17:59:18 +00:00
..
2017-04-10 17:46:03 +00:00
2017-02-21 09:49:10 -08:00
2017-03-28 14:26:55 -07:00
2017-03-06 19:33:25 -08:00
2017-02-21 09:49:10 -08:00