Michael Kwan 5c30475094 Merge \"Temp fix to split header and position count behaviour for watches.\" into nyc-mr1-dev ...

am: 5985e3f92f

Change-Id: I2167505e4c71d6f7bc32d3a90c0c94a0d92319ab

2016-06-11 00:13:22 +00:00

..

java

Merge \"Temp fix to split header and position count behaviour for watches.\" into nyc-mr1-dev

2016-06-11 00:13:22 +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 \\"Reduce shell power over user management.\\" into nyc-dev am: 1b4124fc95

2016-06-10 21:43:38 +00:00

tests

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

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