Jeff Brown b8244f4705 Merge "resolved conflicts for merge of 4e14159a to master"

2010-08-11 18:05:04 -07:00

..

config

…

java

Merge "resolved conflicts for merge of 4e14159a to master"

2010-08-11 18:05:04 -07:00

jni

am 679ac09a: am a5ae50cd: Merge "More native work." into gingerbread

2010-08-11 00:50:56 -07:00

res

Make Fragments use the new animation APIs

2010-08-11 17:54:24 -07:00

tests

am 7cb0fc58: am edae848e: am 301c437b: Remove @LargeTest annotations

2010-08-10 12:04:04 -07:00