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

Merge commit '1bd7261d2b595552ac852ca8ed8a5e184bd10b44'

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