Commit 0d18cd89 authored by Brian Muramatsu's avatar Brian Muramatsu
Browse files

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

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

Change-Id: I5e9642c74dd3381865e731567e7decebb9ab2b71
parents 7e955838 f9be02e2
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