Xia Wang 4bc5c4a1f5 resolved conflicts for merge of 16cbe575 to honeycomb-mr1 ...

Change-Id: Ic55f0bdeb5fc63bdabb4f4546fa7e1aa3201a6e0

2011-03-10 15:09:46 -08:00

..

config

…

java

Merge "Don't limit zoom scale change by the minimum increment." into honeycomb-mr1

2011-03-10 09:04:12 -08:00

jni

Merge "Fix 3510563: memory leak in BitmapRegionDecoder." into honeycomb-mr1

2011-03-09 16:21:53 -08:00

res

Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1

2011-03-10 14:46:18 -08:00

tests

resolved conflicts for merge of 16cbe575 to honeycomb-mr1

2011-03-10 15:09:46 -08:00