| commit | 7cf399e775a7d5bd28cbbef978ab0faa0b6e88b4 | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Thu Apr 07 11:30:45 2011 -0700 |
| committer | Brian Muramatsu <btmura@google.com> | Thu Apr 07 11:30:45 2011 -0700 |
| tree | c5e6d5e44b3ba5016a1a474e8f3d117ce5ca4157 | |
| parent | 29dc1657514733ebf6f76f117decc361b82fdad4 [diff] | |
| parent | 2a6a63e178f030a993f04454e95991acb4fa0472 [diff] |
Merge remote branch 'goog/gingerbread' into manualmerge Conflicts: tests/expectations/knownfailures.txt Change-Id: I9db887535ef970eef0209251460c13b367f23779