am ae88e2d1: Merge change I38227501 into eclair

Merge commit 'ae88e2d130a4d69bdf7ddc58f6ae512ea63087ff' into eclair-plus-aosp

* commit 'ae88e2d130a4d69bdf7ddc58f6ae512ea63087ff':
  Add API to get Active Sinks.
tree: cf0af6090d425544d12fee07682f443f5d0859bc
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE