Mark Wagner 136d3c04b6 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.

2009-09-29 11:13:01 -07:00

..

config

donut snapshot

2009-05-20 11:28:04 -07:00

java

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

2009-09-29 11:13:01 -07:00

jni

am 3ecb11e0: am 65dea14c: Merge change 27129 into eclair

2009-09-28 01:12:24 -07:00

res

am ccc624ca: am ebd45e5c: Merge change I55edce63 into eclair

2009-09-29 11:10:53 -07:00