| commit | 5e8efa07f5f2ad176394953f7f85b2fb8ae0e645 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <[email protected]> | Fri Feb 05 14:09:38 2010 -0800 |
| committer | Android Git Automerger <[email protected]> | Fri Feb 05 14:09:38 2010 -0800 |
| tree | c6282bd471fbf94e29f6c6a8ed780e69958d3f1f | |
| parent | 7bc6900cad9f39390c6943efc952c733a56c590d [diff] | |
| parent | a2fd336a4943a02e31bfdb916755fdd14346688f [diff] |
am d8bdf217: resolved conflicts for merge of e577a83a to eclair-plus-aosp Merge commit 'd8bdf2171af548f321d417147807256e1022c89f' * commit 'd8bdf2171af548f321d417147807256e1022c89f': android-2.1_r1 snapshot