Commit c22a27d0 authored by Brian Muramatsu's avatar Brian Muramatsu
Browse files

Merge remote branch 'goog/gingerbread' into manualmerge 

Conflicts:
	tests/tests/os/src/android/os/cts/BuildVersionTest.java

Change-Id: I831f4056d5d1332e90bae1ce69ecaddb5ece728e
parents 80d4a560 518e6f3e
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