Bryce Lee 5a5626acd7 resolve merge conflicts of b1301fa to nyc-mr1-dev-plus-aosp ...

am: ccd3468567

Change-Id: I5dac528db07b40bb9e59a090bd7e0016ca6e996a

2016-10-18 17:41:52 +00:00

..

java

resolve merge conflicts of b1301fa to nyc-mr1-dev-plus-aosp

2016-10-18 17:41:52 +00:00

jni

Merge "use SkBlendMode instead of SkXfermode use sk_sp versions of paint setters/getters"

2016-10-18 13:57:13 +00:00

res

Merge "Import translations. DO NOT MERGE"

2016-10-18 05:28:55 +00:00

tests

Merge "Iteration on findPath API."

2016-10-18 16:57:04 +00:00