Merge "Prevent NPE when draw is called without bounds being set Test: unit test inside AdaptiveIconDrawableTest.java" into oc-dev
am: 891e03203c

Change-Id: I14746f95c369503f5515e5123a481798fc76197c