Mike Reed 71487eb0ce Merge frameworks/base changes from master-skia to master. ...

Adaptations to changes in Skia upstream since Oct 2014.
(https://code.google.com/p/skia/issues/detail?id=2377)

cbb922d use new roundOut signature
77082de Call SkColorTable::readColors().
5456ab1 Handle the result of SkMatrix::asAffine.
25cfc78 Remove dependence on SK_LEGACY_PICTURE_SIZE_API.

BUG:18468293

Change-Id: I5a4d274e854298843891410b1ffd5e24f038b88a

2015-01-06 21:41:35 +00:00

..

androidfw

am 347040cf: am 740acf21: am c7801877: Merge "Fix issue where non-resource attributes would cause obtainStyleAttributes to fail" into lmp-mr1-dev

2014-12-11 01:38:33 +00:00

common_time

Update calls to IInterface::asBinder()

2014-11-17 10:05:31 -08:00

hwui

Merge frameworks/base changes from master-skia to master.

2015-01-06 21:41:35 +00:00

input

Frameworks/base: Wall Werror in libs/input

2014-11-10 15:55:11 -08:00

storage

Update calls to IInterface::asBinder()

2014-11-17 10:05:31 -08:00

usb

resolved conflicts for merge of 1a4527ce to lmp-mr1-dev-plus-aosp

2014-09-19 16:13:49 -07:00