Commit 98bcc322 authored by Brian Muramatsu's avatar Brian Muramatsu
Browse files

Merge remote branch 'goog/honeycomb-mr2' into ics-mr0 

Conflicts:
	apps/CtsVerifier/AndroidManifest.xml
	tests/expectations/knownfailures.txt

Change-Id: I1b918333883e0f3d651e9f4d65918974eaa3b72f
parents 430a5eac 3f0edcf1
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