Derek Sollenberger 130cf8ce1f Merge "SkStream is no longer a ref counted object."

2015-03-13 12:02:24 +00:00

..

java

Add a type parameter to startActionMode() calls.

2015-03-13 10:51:51 +00:00

jni

Merge "SkStream is no longer a ref counted object."

2015-03-13 12:02:24 +00:00

res

am 276d1bc9: am a98c21a6: Make circular mask thickness configurable

2015-03-12 20:31:52 +00:00

tests

Merge "NetworkStats to support VPN accounting."

2015-03-12 22:10:56 +00:00