| commit | 4d2f2058ddeb36c8d6c96a277b58cdef897ddf88 | [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 | 57c4148b8ec4afb95e34065c6930d5f0fbe0877f | |
| parent | e704a78bf7a9a91bc2dfcfda8ee4acf8dcd80ef8 [diff] | |
| parent | f108edaa630a5d808328fe892cba7ebbefb26ce0 [diff] |
Merge remote branch 'goog/gingerbread' into manualmerge Conflicts: tests/expectations/knownfailures.txt Change-Id: I9db887535ef970eef0209251460c13b367f23779