tree 852c136273c5cf721cf9c0cb26d9ba2549121c8f
parent 0ea9093df7c383a13dc3a31c4c55b38497001ae3
parent a04451827ebfb9248fe6897eaa2c09b00f15b09c
author Jorim Jaggi <jjaggi@google.com> 1475226615 +0000
committer android-build-merger <android-build-merger@google.com> 1475226615 +0000

Merge "Fix crash if drawable doesn't have constant state" into nyc-mr1-dev
am: a04451827e

Change-Id: I722f3400659581bc01b4bfadce34c5d61142b71d