tree bb8b82b4fbd1db7d4ff824ba41044dfa52376423
parent a3fc533d77bb8c12913953bb78849c548a437a3c
parent f66bdf9b577f93485529af7bfe45f3a62a64e950
author Alan Viverette <alanv@google.com> 1467219681 +0000
committer android-build-merger <android-build-merger@google.com> 1467219681 +0000

Merge \"Disable constant state sharing for VectorDrawable\" into nyc-dev
am: f66bdf9b57

Change-Id: I0c6397987d926c35cb5486fd9d2cb22efb8d8f14