Commit 25a507bb 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: I66f076447658a6628a46b88229ff16e1109e308f
parents c3709ba4 e7ab9874
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