am b6ffc8f2: am 16396414: Merge change If5b0b6fa into eclair-mr2

Merge commit 'b6ffc8f2535c38703e753cfc1535134b5976c4e1'

* commit 'b6ffc8f2535c38703e753cfc1535134b5976c4e1':
  Fixed class paths in layout xml files