am 0274a22b: Merge "Add a color for settings button." into lmp-mr1-dev

* commit '0274a22bd9c8fd6037c6a251174dd92ddeada016':
  Add a color for settings button.
tree: 236bbe1c4e94d78026186eced17f485024bcffa9
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags