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

Browse Source

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

Change-Id: I1b918333883e0f3d651e9f4d65918974eaa3b72f

...

This commit is contained in:

Brian Muramatsu

2011-11-17 17:21:23 -08:00

parent 3dc050e0eb f021575916

commit 309f8b3fb5

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available