tree 4093c105c75fb450b1f0458ba7ac85fe1e4bc187
parent daf05d3e91e817825562055cbf0b67e704defc7a
parent 1ddc0077ac0c26a9dc74875791bfea3f34a8cc7b
author Xavier Ducrohet <xav@android.com> 1258411222 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258411222 -0800

am 1ddc0077: am 19e420c5: Merge change Iae493184 into eclair

Merge commit '1ddc0077ac0c26a9dc74875791bfea3f34a8cc7b' into eclair-mr2-plus-aosp

* commit '1ddc0077ac0c26a9dc74875791bfea3f34a8cc7b':
  Minor fix for the parent style computation in the layoutlib.