Merge "Add option to avoid clobbering visibility of <declare-styleable>" am: 7b56a5075d am: 002ba59e2b am: ca5be49926
Change-Id: I51191b227424de562f425f10e3441bee990afbe9
This commit is contained in: