| commit | 327b64c939ec0534753e6e03e7bb76577cdc36f9 | [log] [tgz] |
|---|---|---|
| author | Huahui Wu <[email protected]> | Wed Apr 21 09:02:00 2010 -0700 |
| committer | Android Git Automerger <[email protected]> | Wed Apr 21 09:02:00 2010 -0700 |
| tree | 2083e5b45e25e86063cd60b34d6cb0a43571cc7a | |
| parent | 068012174ace0b90f5ef78b89e6d7a673cbf9158 [diff] | |
| parent | 35ae949c4a2af9df0ba74156cde5629c9d9f8c69 [diff] |
am 35ae949c: (-s ours) DO NOT MERGE Merge commit '35ae949c4a2af9df0ba74156cde5629c9d9f8c69' into kraken * commit '35ae949c4a2af9df0ba74156cde5629c9d9f8c69': DO NOT MERGE