Commit 5ef30799 authored by Brian Muramatsu's avatar Brian Muramatsu
Browse files

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
parents 71dbe44d 79c1d920
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment