| commit | c22a27d088fab0cc7fc916a649d26633f9353439 | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Wed Apr 20 15:33:31 2011 -0700 |
| committer | Brian Muramatsu <btmura@google.com> | Wed Apr 20 15:33:31 2011 -0700 |
| tree | 12b1e594cf10952fd782a28f269d190cf54dcdc3 | |
| parent | 80d4a560dd00759647842cfecca5ca40a5e2c4a4 [diff] | |
| parent | 518e6f3e932563d8a3ead37d04703ca4e5b0191a [diff] |
Merge remote branch 'goog/gingerbread' into manualmerge Conflicts: tests/tests/os/src/android/os/cts/BuildVersionTest.java Change-Id: I831f4056d5d1332e90bae1ce69ecaddb5ece728e