am 064380b1: am 7d762002: Merge change I097b444e into eclair

Merge commit '064380b1edb326a6feb9d26b28bd590304eb1d7d'

* commit '064380b1edb326a6feb9d26b28bd590304eb1d7d':
  Fix ApiDemo Layout rendering test