Derek Sollenberger 613e5a0ee6 Merge "CreateLightingFilter is now on SkColorMatrixFilter"

2016-01-13 15:34:57 +00:00

..

java

Merge "Apply tick mark tint during view construction"

2016-01-13 15:16:11 +00:00

jni

CreateLightingFilter is now on SkColorMatrixFilter

2016-01-13 14:35:45 +00:00

res

Merge "Add a TETHER_PRIVILEGED permission and use it where needed."

2016-01-11 19:10:22 +00:00

tests

Merge "Add a TETHER_PRIVILEGED permission and use it where needed."

2016-01-11 19:10:22 +00:00