| commit | 0a310052e8c7e150d1b983687ca94270ca91acb4 | [log] [tgz] |
|---|---|---|
| author | repo sync <enh@google.com> | Sat May 01 12:37:06 2010 -0700 |
| committer | repo sync <enh@google.com> | Sat May 01 12:37:06 2010 -0700 |
| tree | 0d9747818a30e1d7c635e0cce2f5a1100d5ec546 | |
| parent | 57cf2608873e13d609350bdcf33070e5cf0d15bf [diff] | |
| parent | f3565212d8dce6d6e037c07544840cecd7710bf5 [diff] |
resolved conflicts for merge of f3565212 to froyo-plus-aosp Change-Id: I5e14e57bcdac566dd8eca95c92f45503a2760b4e