Brian Carlstrom 78448edcdd resolved conflicts for merge of 50d35946 to master ...

Change-Id: Ia8c3312d626952c378fc4e7fec1d46119e2ccf42

2010-08-25 11:32:17 -07:00

..

config

…

java

Merge "In ActionBarImpl, only use mActionView after we've checked that it's non-null"

2010-08-25 10:30:20 -07:00

jni

resolved conflicts for merge of 50d35946 to master

2010-08-25 11:32:17 -07:00

res

Added Romansh-language versions of error messages "loaderror.html"

2010-08-25 17:33:13 +02:00

tests

am d0ad67ad: Merge "Fix the test breakage in vCard tests." into gingerbread

2010-08-24 18:31:22 -07:00