tree 12b1e594cf10952fd782a28f269d190cf54dcdc3
parent 80d4a560dd00759647842cfecca5ca40a5e2c4a4
parent 518e6f3e932563d8a3ead37d04703ca4e5b0191a
author Brian Muramatsu <btmura@google.com> 1303338811 -0700
committer Brian Muramatsu <btmura@google.com> 1303338811 -0700

Merge remote branch 'goog/gingerbread' into manualmerge

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

Change-Id: I831f4056d5d1332e90bae1ce69ecaddb5ece728e