Merge commit 'c7bade2a910d3fd34275440d1cc8bb9c0c9a989a' into eclair-mr2-plus-aosp * commit 'c7bade2a910d3fd34275440d1cc8bb9c0c9a989a': Add a test to make sure the replaced classes in layoutlib are correct.
Merge commit 'c7bade2a910d3fd34275440d1cc8bb9c0c9a989a' into eclair-mr2-plus-aosp * commit 'c7bade2a910d3fd34275440d1cc8bb9c0c9a989a': Add a test to make sure the replaced classes in layoutlib are correct.