| commit | a25a7bf1702a2948bed54ffedee3bf0dee002821 | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@android.com> | Wed May 04 12:46:48 2011 -0700 |
| committer | Android Code Review <code-review@android.com> | Wed May 04 12:46:48 2011 -0700 |
| tree | df57082622a01cc5b958f28e3f7e1ca092897867 | |
| parent | 40f7f9772ef3faa1de2041e85a5450f9054b9868 [diff] | |
| parent | d4f52eee578e397cc3946aa3fc1ab2cfc7602a0a [diff] |
Merge "Merge remote branch 'korg/froyo' into manualmerge" into gingerbread