Andrew Sapperstein 91a540b2de Merge \"Refactor DeviceDefault themes.\" into nyc-mr1-dev ...

am: 2f75cf4bb5

Change-Id: I17994da6c924596798b03cd684005dd0b71ab2c9

2016-06-16 22:08:07 +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 \"Refactor DeviceDefault themes.\" into nyc-mr1-dev

2016-06-16 22:08:07 +00:00

tests

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

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