Merge "Add a color for settings button." into lmp-mr1-dev
tree: 55913eeef3cc16b61ce63e57f8426094d69caa66
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags