Brian Muramatsu 8128f7face Merge remote branch 'goog/gingerbread' into manualmerge ...

Conflicts:
	tests/tests/accounts/src/android/accounts/cts/AccountManagerTest.java
	tests/tests/net/src/android/net/cts/ConnectivityManagerTest.java
	tests/tests/net/src/android/net/cts/NetworkInfoTest.java

Change-Id: Ia16b95167e5c023cc977ea9d6bf2323d5c6cbf71

2011-04-27 13:51:31 -07:00

..

cts/net

Merge remote branch 'goog/gingerbread' into manualmerge

2011-04-27 13:51:31 -07:00