636d9cd63b
Merge commit '5becdc32c899f1e8031f5a694c064cb559a8fc88' into eclair-mr2-plus-aosp * commit '5becdc32c899f1e8031f5a694c064cb559a8fc88': Fix the layoutlib test to run from adt-tests.