Adam Powell 54832cdb76 Merge "Clear ViewGroup nested scrolling axes when nested scrolling stops"

2015-04-16 22:58:39 +00:00

..

java

Merge "Clear ViewGroup nested scrolling axes when nested scrolling stops"

2015-04-16 22:58:39 +00:00

jni

Merge "Remove Bitmap#getSkBitmap"

2015-04-16 14:29:21 +00:00

res

Merge "Added attribute showForAllUsers that deprecates showOnLockScreen"

2015-04-16 22:35:35 +00:00

tests

am 73e056d3: am 402f2501: am 3312c6b9: Merge "Add android.net.IpPrefix#contains()"

2015-04-14 09:58:38 +00:00