am cdc8b326: Merge change I61741f5a into eclair

Merge commit 'cdc8b326dd0989003e2fdd7d5a605b5755acf221' into eclair-mr2

* commit 'cdc8b326dd0989003e2fdd7d5a605b5755acf221':
  Fix high density bug 2179543: use 'dip' instead of 'px'