Yorke Lee 11e3bf5d30 Merge \\"Limit global drags to apps targeting SDK 24 and above\\" into nyc-dev am: f33af2285b ...

am: 3d80871032

Change-Id: I2f7745317f6ae0932d7c16469b500847e465a912

2016-06-16 21:27:50 +00:00

..

java

Merge \\"Limit global drags to apps targeting SDK 24 and above\\" into nyc-dev am: f33af2285b

2016-06-16 21:27:50 +00:00

jni

Merge changes from topic \'VectorDrawable polishing cherrypicks from master\' into nyc-mr1-dev

2016-06-09 23:42:16 +00:00

res

Merge \"Add better configurability for dialog theme colours.\" into nyc-mr1-dev

2016-06-16 18:49:44 +00:00

tests

Merge \"Update enable/disable code to reduce flakiness\" into nyc-mr1-dev

2016-06-08 23:33:47 +00:00