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