Merge commit '1ddc0077ac0c26a9dc74875791bfea3f34a8cc7b' into eclair-mr2-plus-aosp * commit '1ddc0077ac0c26a9dc74875791bfea3f34a8cc7b': Minor fix for the parent style computation in the layoutlib.
Merge commit '1ddc0077ac0c26a9dc74875791bfea3f34a8cc7b' into eclair-mr2-plus-aosp * commit '1ddc0077ac0c26a9dc74875791bfea3f34a8cc7b': Minor fix for the parent style computation in the layoutlib.