| commit | 258bb1bd030f67a9367aa1627b8da7d45f57a85d | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon May 17 14:58:44 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 17 14:58:44 2010 -0700 |
| tree | 4598b779f45142769d038eef6b7877edc05602a5 | |
| parent | 6bab93f90ff553c87f3254bcc576c89cc76a08f7 [diff] | |
| parent | e8cde6f9ba713a7f579fee226c9a41753d48b332 [diff] |
am 5942ccf0: am 9eb7a722: resolved conflicts for merge of f7fb5331 to kraken