am 636d9cd6: am 5becdc32: am a970bf52: Merge change I34f51342 into eclair

Merge commit '636d9cd63b77a87e6cb627a90cc8f37e81bedb14'

* commit '636d9cd63b77a87e6cb627a90cc8f37e81bedb14':
  Fix the layoutlib test to run from adt-tests.