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

Merge remote branch 'goog/honeycomb-mr2' 

Conflicts:
	apps/CtsVerifier/AndroidManifest.xml
	tests/core/ctscore.mk
	tests/tests/os/src/android/os/cts/BuildVersionTest.java
	tools/host/src/com/android/cts/Version.java

Change-Id: Ic3a6a3754f1db91947217af64c43e8b7fb35695e
parents 9d83abe9 77c1cf40
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