Commit 668344dd authored by Brian Muramatsu's avatar Brian Muramatsu
Browse files

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

Conflicts:
	tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java

Change-Id: I7c1af2c95488db0e14e2973b6d0dc6ad33059dfe
parents e08370d9 1eacc524
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