Commit 1a15e527 authored by Brian Muramatsu's avatar Brian Muramatsu
Browse files

Merge remote branch 'goog/gingerbread' into honeycomb 

Conflicts:
	apps/CtsVerifier/AndroidManifest.xml
	tests/tests/app/src/android/app/cts/DownloadManagerTest.java

Change-Id: I16c2d14484dea54d89c3ccb105e2dfacace1f9e1
parents 833b45e9 7e45cf25
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