am 5b0fb521: am 290a48b3: Merge "Fix typos in name of density-independent pixels" into froyo

Merge commit '5b0fb521e6af1ca61141daa3d86f97fd6343f5e4' into kraken

* commit '5b0fb521e6af1ca61141daa3d86f97fd6343f5e4':
  Fix typos in name of density-independent pixels