Merge change 24114 into eclair

* changes:
  Fix issue 1992233: DTMF tones on Sholes is really long.
tree: 77b81830f0f5366bcffd939bca96a5758e56e96b
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE