Mark Salyzyn 173215d1b2 resolve merge conflicts of ec7e2a164c37 to master ...

Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I49c6e41b79061e2b3c0352e3ac8fa5ebb152b6f5

2017-01-12 08:28:30 -08:00

..

common

HWUI: fix support RGB_565 for hardware bitmaps

2016-12-14 16:34:55 -08:00

macrobench

resolve merge conflicts of ec7e2a164c37 to master

2017-01-12 08:28:30 -08:00

microbench

SkClipOp is now an enum class

2016-12-14 10:29:54 -05:00

scripts

Merge "HWUI: prepare script for marlin & sailfish Test: this is a bench infrastucture"

2016-12-15 23:37:22 +00:00

unit

Fix Skia merge by fixing API mismatch.

2017-01-11 14:57:34 -05:00