Jeff Hamilton bde0716dac resolved conflicts for merge of 08ace2e0 to master

2009-12-17 15:17:54 -06:00

..

config

…

java

resolved conflicts for merge of 08ace2e0 to master

2009-12-17 15:17:54 -06:00

jni

am 0249c83e: am 31a69fdb: throw if we have a null typeface native instance (so we don\'t crash in native code) we may still have to native-destroy a Typeface with a null ref, so check for that

2009-12-17 09:27:42 -08:00

res

Cherry-picking c95b39d3 from eclair-mr2

2009-12-15 16:42:47 -08:00