am 04a35419: am 510fa1ea: Merge "Remove unneeded dimming code"

* commit '04a3541979481b164cc37f62402941f7ee435403':
tree: c2175942e3a631ad112fe6ab17da560c45fc1ae2
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags