Merge "Move GradientDrawable stroke fields back to grey list" into qt-dev
am: 2516b14955

Change-Id: I418879391a5bb0bf22f89fe24304c0bc390c0022