Merge change I89e74ba1 into eclair

* changes:
  Fix Issue 2158631: AudioService: volume control sometimes not restored after media server process crash.
tree: c57db39920657deb7b38e4a2e83706d7f8f20836
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE