15ff8ed31f
Merge commit 'c54e0ce964f4d38089def7ecee850a659f84bbe5' into eclair-plus-aosp * commit 'c54e0ce964f4d38089def7ecee850a659f84bbe5': Fix layoutlib tests so they pas when run from Eclipse workbench.