Jean-Baptiste Queru 65dd62a306 resolved conflicts for merge of ee27dd35 to master ...

Change-Id: Ia9f4ea86b8554ff04a3aa6b9e065239ae73740e7

2010-12-07 13:17:37 -08:00

..

config

…

java

resolved conflicts for merge of ee27dd35 to master

2010-12-07 13:17:37 -08:00

jni

Add inPreferQualityOverSpeed into BitmapFactory.Options.

2010-12-06 14:24:51 -08:00

res

resolved conflicts for merge of ee27dd35 to master

2010-12-07 13:17:37 -08:00

tests

Merge "Test that we use proxies specified by system properties."

2010-12-06 15:24:28 -08:00