Gilles Debunne 6eea4cd187 resolved conflicts for merge of ff545380 to master ...

Change-Id: Ida3b6cec13b03d734bb1ba4e31554eb5226da749

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

..

config

…

java

resolved conflicts for merge of ff545380 to master

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

jni

Merge "Purge Skia objects from GL caches as needed."

2010-09-08 18:06:11 -07:00

res

Support MBCS characters in contacts and SMS messages that are stored in SIM cards.

2010-09-09 13:23:42 -07:00

tests

am 0c592acf: Merge "Adding Download Manager Integration, stress, and hosts-based tests." into gingerbread-plus-aosp

2010-09-08 20:26:50 -07:00