Commit 8a5d4b91 authored by Brian Muramatsu's avatar Brian Muramatsu
Browse files

Merge remote branch 'goog/gingerbread' into honeycomb 

Conflicts:
	apps/CtsVerifier/AndroidManifest.xml
	tests/tests/telephony/src/android/telephony/cts/SmsMessageTest.java
	tools/host/src/com/android/cts/Version.java

Change-Id: Ie15a3eb7f002a300469f17e3f906856c07061223
parents 339ca111 73f783fc
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