| commit | 0d9b02c47b7b52b963f09a01fee9717c49d6e06e | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Nov 17 17:35:09 2010 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Nov 17 17:35:09 2010 -0800 |
| tree | 9a59370474038e9c0d9ab86fdeacfd8185cf2bf3 | |
| parent | 04cdb78c6a2ac66505d0b29033353cfd7e2c3d78 [diff] | |
| parent | 8565a8ebbc26f5d453468bd5acd238e8e00e3629 [diff] |
Merge "resolved conflicts for merge of 1a2344b8 to master"