Dianne Hackborn 6171401a0a resolved conflicts for merge of 6a3ffb5b to master ...

Change-Id: I3c77887f56c4fdc1cd80682eccc2f5e0020e2761

2010-09-03 16:40:58 -07:00

..

config

…

java

resolved conflicts for merge of 6a3ffb5b to master

2010-09-03 16:40:58 -07:00

jni

Merge "Add set/get band in WifiNative"

2010-09-02 15:39:16 -07:00

res

Add ability to enable layout transition animations by default from XML

2010-09-03 16:22:22 -07:00

tests

am 4ca550a1: am 947e25e5: am ac3c1f55: Add BT test instrumentation for reboot tests.

2010-09-02 15:03:12 -07:00