Romain Guy 21986f2ae7 Merge "Linear blending, step 1"

2016-10-12 15:52:14 +00:00

..

java

Merge "Linear blending, step 1"

2016-10-12 15:52:14 +00:00

jni

Merge "Linear blending, step 1"

2016-10-12 15:52:14 +00:00

res

Fix issue where icon was not centered properly. am: ac29ce3fe2

2016-10-12 00:25:06 +00:00

tests

…