| commit | 4387335ba33344efcfa2105fa098cc877744003f | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Jul 20 15:02:35 2011 -0700 |
| committer | Elliott Hughes <enh@google.com> | Wed Jul 20 15:02:35 2011 -0700 |
| tree | cc65a9c6d4189116569b2a7b88ba26368c57f717 | |
| parent | ae5df05f2246515a652f0c935c6deb85a0bdee01 [diff] |
Manually merge the changes made in honeycomb-mr2 to get this on the web. We'd made good changes in both branches. Change-Id: I64fb4f1ff06da8767c5a6cee9fbcc2b955d6e207