Merge "Use ToneGenerator::tone_type consistently"
tree: 8de4de832991dd2086313b6168f8523d002f6251
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/