am 0acf9a5b: Merge change 26539 into eclair

Merge commit '0acf9a5b2f81413641d3d139ae6fd5f9df621e5f' into eclair-plus-aosp

* commit '0acf9a5b2f81413641d3d139ae6fd5f9df621e5f':
  Add density value to density enum.