Merge change 24512 into eclair

* changes:
  Fix issue android.permission.cts.NoAudioPermissionTest:testRouting is failing.
tree: b7c50baab768f61cb535e02fee7351bc650005a3
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE