tree fc6617fc1808839147e2e8605c081834e2b06025
parent 3c002390509fdcedb5e5845b1c350ef6c14ffa84
parent e49ba3917240f2c5e9df75132850a4db45f57b9c
author Diego Perez <diegoperez@google.com> 1489581800 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1489581804 +0000

Merge "Workaround for broken BitmapShader in AdaptiveIconDrawable"