| commit | 9cde3ce3bd58a3276a927c11ece3e3d27db74a9b | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Jul 26 10:22:58 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Jul 26 10:22:58 2010 -0700 |
| tree | be90f2d23071ae29c91a55d659e815fdc0ca332f | |
| parent | 4566a03cf66db85c16a39d9bff93992fc99b8fe4 [diff] | |
| parent | ccaa41429d2afc47f0fb828a0146a1b1936188fe [diff] |
resolved conflicts for merge of b237bdb6 to gingerbread-plus-aosp Change-Id: Ibd9f488a0331c472a852054af5db06f8e7d35e76