82c88fc3a7
Merge commit 'a2a60a215030ca2171bc59aaeeac4179816f0796' * commit 'a2a60a215030ca2171bc59aaeeac4179816f0796': Fix NPE in GradientDrawable constructor