Matt Sarett db4773f0df Correct rowBytes on SkBitmap to match recycled bitmap sooner ...

This will prevent us from triggering asserts when we
call lockPixels().

skbug.com/4538

Change-Id: Ibcd18818e33ccbacdcdfa57e822b04dd91b6af17

2016-05-19 13:28:50 +00:00

..

java

Merge "Workaround for ignored resizeableActivity param" into nyc-dev am: 005f9a73fb am: 6b21f45add

2016-05-19 08:12:56 +00:00

jni

Correct rowBytes on SkBitmap to match recycled bitmap sooner

2016-05-19 13:28:50 +00:00

res

Merge "Fix build breakage caused by redefining attrs" into nyc-dev am: fa020a8094 am: 1b9a930ba4

2016-05-19 07:20:59 +00:00

tests

Merge "Move LocaleList to avoid layering violation." into nyc-dev am: 31884efd13 am: ddaf3f4681

2016-05-18 02:25:10 +00:00