Dmitri Plotnikov 658915aeec am 375b8016: am bbdba641: Merge change Icae1a990 into eclair-mr2 ...

Merge commit '375b80162f58d93d8aef055a1ca1d42964132708'

* commit '375b80162f58d93d8aef055a1ca1d42964132708':
  Adding NAME_RAW_CONTACT_ID column to Contacts.

2009-12-02 20:46:57 -08:00

..

config

…

java

am 375b8016: am bbdba641: Merge change Icae1a990 into eclair-mr2

2009-12-02 20:46:57 -08:00

jni

resolved conflicts for merge of dfaf2e03 to master

2009-11-25 15:05:51 -05:00

res

am e2585127: am 9ed7dc10: am 5886050f: Merge change I0d8f7593 into eclair

2009-12-02 20:24:44 -08:00