am b74e2ac4: am 1cff7476: Merge change Ie7d26695 into eclair

Merge commit 'b74e2ac44c72c846095334fab7f60111c1271f34'

* commit 'b74e2ac44c72c846095334fab7f60111c1271f34':
  Modify the "active chats" uri to not overlap with other uris.
tree: 6891403aad3b1f4996e41ba2949a0d33959ce5df
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE