Merge "Add EXTRA_SETTINGS activities to a category."
tree: 4f6a0dde0cdd652c06f7aedddaae19640a99e338
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml