Commits

Xavier Ducrohet authored 82b9232565b
LayoutLib: Use special view cookie for include-merge case. All items directly under the <merge> tag now return the view cookie of the referencing <include> tag using a special class for easy differentiation in the calling client. Change-Id: I7a2a4e642be9564f47e256fd1586012497d34792