Commit e7ab9874 authored by Brian Muramatsu's avatar Brian Muramatsu
Browse files

Merge remote branch 'goog/honeycomb' into honeycomb-mr1 

Conflicts:
	apps/CtsVerifier/AndroidManifest.xml
	apps/CtsVerifier/res/values/strings.xml
	tests/tests/media/src/android/media/cts/MediaPlayerTest.java
	tests/tests/media/src/android/media/cts/MediaRecorderTest.java
	tools/host/src/com/android/cts/Version.java

Change-Id: Ic0ec7b9654683d7686c9d7f714caf5cbacef7aad
parents c98733e3 ae0c107f
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