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

Merge commit '290a48b365479eccd16023b5de0d92063bb68b4d' into froyo-plus-aosp

* commit '290a48b365479eccd16023b5de0d92063bb68b4d':
  Fix typos in name of density-independent pixels