tree 373d328201332a614bf871f051505d9d00a6bcdc
parent c7b87766b21fe5cf2f644efa8753b936d413dc9a
author Xavier Ducrohet <xav@android.com> 1306202838 -0700
committer Xavier Ducrohet <xav@android.com> 1306259730 -0700

Merge 6103e22c from honeycomb-mr1. do not merge.

LayoutLib: custom styles override the default style instead of replacing it.

Intead of reading either the custom or the default style for a widget, we
read both and use the values from the custom style if it exists, or
from the default style otherwise.

Change-Id: Ibcec2e9b1e8a95295ab26ede145c287ff2f30be4