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

Merge remote branch 'goog/honeycomb' into manualmerge 

Conflicts:
	tools/host/src/com/android/cts/Version.java

Change-Id: I059dc4b100504988ab3b1ccbd0a0bd61c1b05787
parents 9aa43435 88148d24
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