am 87ed10d7: Merge change I577dd1f3 into eclair

Merge commit '87ed10d78d290f48d382a6e628241da0c61cfb45' into eclair-plus-aosp

* commit '87ed10d78d290f48d382a6e628241da0c61cfb45':
  Accept incoming connections if no other sink is in NonDisconnecting state.
tree: 7d5330152c49ca35fd3948d913acff0edebb6230
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE