commit | 50630192bffb0805316df520d3bbe4a99ffeb8f4 | [log] [tgz] |
---|---|---|
author | Brian Muramatsu <btmura@android.com> | Wed Feb 16 15:31:46 2011 -0800 |
committer | Android Code Review <code-review@android.com> | Wed Feb 16 15:31:46 2011 -0800 |
tree | 40eba9854181649292d945a590cf1f1a8e6de480 | |
parent | 60d865967ce492e25840458045a0f23f68e41aa7 [diff] | |
parent | d523e02177e5cbd2b0eb09b94a81862f3b24693e [diff] |
Merge "Merge remote branch 'korg/froyo' into manualmerge" into gingerbread