Jean-Baptiste Queru 980bd4a12d am 84f992a2: resolve conflicts ...

Merge commit '84f992a249491b9f755e879bf096baac3f9472f5'

* commit '84f992a249491b9f755e879bf096baac3f9472f5':
  Adding Download Manager Integration, stress, and hosts-based tests.

2010-09-08 10:28:41 -07:00

..

config

…

java

Merge "Rename several animation classes"

2010-09-08 10:25:19 -07:00

jni

am 8fc6f8b2: am 1b214be9: Merge "Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."" into gingerbread

2010-09-07 22:10:58 -07:00

res

Rename several animation classes

2010-09-08 09:41:21 -07:00

tests

am 84f992a2: resolve conflicts

2010-09-08 10:28:41 -07:00