| commit | cd71a272fbe574349bd27337fa24130ca3734dbb | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@android.com> | Fri Apr 15 14:20:21 2011 -0700 |
| committer | Android Code Review <code-review@android.com> | Fri Apr 15 14:20:21 2011 -0700 |
| tree | ed66a21c20c2fc35b7edb151b500ad6e7487d3bb | |
| parent | b859e6afb1ec3128fecbdf455ca32aca032dc187 [diff] | |
| parent | 35f156f19ce6ad4e2645a6c1dfccad71d98e81e7 [diff] |
Merge "Merge remote branch 'korg/froyo' into manualmerge" into gingerbread