tree 2e649b4b98cd35a893f038f5fa0179db62e2c597
parent 61d7a8aad32397f1b76692eed37365bde0961316
parent c569cc7d93cb14057f3d81f6dea503dc73225fba
author Alan Viverette <alanv@google.com> 1467220253 +0000
committer android-build-merger <android-build-merger@google.com> 1467220253 +0000

Merge \"Merge \\\"Disable constant state sharing for VectorDrawable\\\" into nyc-dev am: f66bdf9b57 am: a75526bd11\" into nyc-mr1-dev-plus-aosp
am: c569cc7d93

Change-Id: I4b92ae13f931bcd5c4afcf557792cd9a0ff948fd