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

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

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

Change-Id: I774af5228660f860a64e3bfec8baaab6643c3d84
parents 177bac55 03eae653
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