Commit 75ba8288 authored by Brian Muramatsu's avatar Brian Muramatsu
Browse files

Merge remote branch 'goog/gingerbread' into manualmerge 

Conflicts:
	tests/tests/text/src/android/text/method/cts/TouchTest.java
	tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java
	tools/host/src/com/android/cts/Version.java

Change-Id: I6196b9bd85b4e93978dd0ae9b457812b08bd7f0e
parents a39c49ba 5e50522a
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