tree f805ced2e4e77782b294d62776c5fb92dd313dce
parent e08370d982cfc62f5d12fecec427e784a6a8e15b
parent 1eacc524d600f8740b421fdaa3bae2c538a8eb0c
author Brian Muramatsu <btmura@google.com> 1315955414 -0700
committer Brian Muramatsu <btmura@google.com> 1315955414 -0700

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

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

Change-Id: I7c1af2c95488db0e14e2973b6d0dc6ad33059dfe