Commit 3fafc674 authored by Brian Muramatsu's avatar Brian Muramatsu
Browse files

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

Conflicts:
	apps/CtsVerifier/AndroidManifest.xml

Change-Id: Idae96c502113b2bcd1e4a63c702f9b7f105133f5
parents 20abc2a3 446004f3
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