Commit 640eed06 authored by Brian Muramatsu's avatar Brian Muramatsu
Browse files

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

Conflicts:
	tests/tests/view/src/android/view/cts/WindowTest.java

Change-Id: Icd191ae8287820e8257d8c732ad168898bad76b3
parents ac3763ef d1759f5e
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