am 8dd4e92c: Merge change I74fdf8c6 into eclair

Merge commit '8dd4e92cc6838b811b7e8b81cb87bb1533bbf789' into eclair-mr2

* commit '8dd4e92cc6838b811b7e8b81cb87bb1533bbf789':
  Fix device dpi handling in the Layout device parsing/UI.