Merge "Check for null drawable during LayerDrawable.jumpToCurrentState()" into nyc-dev
am: 68d180b

* commit '68d180bbd1892ee5112c76be842a40a7251ed5a5':
  Check for null drawable during LayerDrawable.jumpToCurrentState()

Change-Id: Ida4daa96fdbee8b2d566ddb054f82af9120a86f3