am f05f92a2: (-s ours) Merge change Id16e0e13 into donut

Merge commit 'f05f92a24214f04c88ed3161a4cc684d70192cc1' into eclair

* commit 'f05f92a24214f04c88ed3161a4cc684d70192cc1':
  Add density value to density enum.