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