Projects >> platform_frameworks_base >>285aae15e67693f16bba7715156787d408fa020f

Chunk
Conflicting content 
                if (drawable != null) {
                    drawable.setCallback(this);
                }
<<<<<<< HEAD

                childDrawable.mDrawable = drawable;
                mLayerState.invalidateCache();
=======
                layers[i].mDrawable = drawable;
                mLayerState.mHaveStateful = false;
>>>>>>> fe710551cfd98ce90f331e3b9a240d46f303f7b1
                return true;
            }
        }
Solution content 
                if (drawable != null) {
                    drawable.setCallback(this);
                }

                childDrawable.mDrawable = drawable;
                mLayerState.invalidateCache();
                return true;
            }
        }
File
LayerDrawable.java
Developer's decision
Version 1
Kind of conflict
Array access
Attribute
Method invocation
Variable