am 5b422186: am 9c4c98b1: Merge "new presence icons for video/audio chats." into gingerbread

Merge commit '5b422186f3740a228620210db6d0be0a9838be51'

* commit '5b422186f3740a228620210db6d0be0a9838be51':
  new presence icons for video/audio chats.
tree: 6329fe2ad41269c45fb90e7ea9fb624d53af82ab
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE