am f3b87c2e: (-s ours) am 9112b8eb: DO NOT MERGE - Ringtone bugfixes (round 1)

* commit 'f3b87c2ebd69f96969659a4ab7f2eb55fa90189d':
  DO NOT MERGE - Ringtone bugfixes (round 1)
tree: 3caf86b3582c7c14ea4ab9195620ebf922f202f5
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE