tree 6093c370379123b0e5591079e083f3259e1c9085
parent a57632fee792d6078a7a61006f5a866c38addd33
parent 19e420c52dbe42e5b4b8b3580a5e7908cebec89d
author Xavier Ducrohet <xav@android.com> 1258399973 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258399973 -0800

am 19e420c5: Merge change Iae493184 into eclair

Merge commit '19e420c52dbe42e5b4b8b3580a5e7908cebec89d' into eclair-mr2

* commit '19e420c52dbe42e5b4b8b3580a5e7908cebec89d':
  Minor fix for the parent style computation in the layoutlib.