Brad Fitzpatrick e0ad63bf1e resolved conflicts for merge of 6718b365 to master ...

Change-Id: I32762a4a3b00856f6765d50667b667264a385fc6

2010-10-01 13:57:04 -07:00

..

config

…

java

resolved conflicts for merge of 6718b365 to master

2010-10-01 13:57:04 -07:00

jni

am f7681f84: Do not merge.

2010-10-01 12:36:05 -07:00

res

Create dummy assets for text selection actions.

2010-10-01 13:50:59 -04:00

tests

am 5dcaf7b0: am fcf1948a: Moved Rfc822 validator test

2010-09-30 14:56:34 -07:00