Merge "Adding disabled colors for settings."
tree: b1dc754af4a38f296e40254bdf80f14aa958a56c
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags