Xia Wang 05ab5caa80 am cf994cc5: Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into honeycomb-mr1 ...

* commit 'cf994cc57df33121cea7a0082c8ea55ca125279c':
  Add WifiStressTest to Wi-Fi only test suite.

2011-03-10 15:57:27 -08:00

..

config

…

java

am 0837fde9: Merge "Don\'t limit zoom scale change by the minimum increment." into honeycomb-mr1

2011-03-10 09:07:22 -08:00

jni

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

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

res

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

2011-03-10 14:47:57 -08:00

tests

resolved conflicts for merge of 16cbe575 to honeycomb-mr1

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