| commit | 97ec345459eeb2670d48c48eb2f8cab05ba308ff | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Oct 11 13:48:18 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Oct 11 13:48:18 2010 -0700 |
| tree | c826e7f391c7efe7f7a01788bb58bfda44bd6bdd | |
| parent | 68ec33e8e5135f34c15dded4891f50517b4d7418 [diff] | |
| parent | 11bf143e9428c3f9c0a2f807f0720bbd7615a174 [diff] |
resolved conflicts for merge of 11bf143e to gingerbread-plus-aosp Change-Id: I3f34ed8c90a995bc36345eeb3bd816b9a49df394