diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-23 19:07:49 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-08-23 19:07:49 -0700 |
| commit | f46e606cf483d5613dba1a9c02b08817fa4fec7e (patch) | |
| tree | 9aa7d6094b6675d1aac85aca305f20b6dde08341 | |
| parent | 35a24c2a418059976cc09598ea92251771a84e74 (diff) | |
| parent | a3b242b63b6438004bc46de0bf17555fb4f39fa0 (diff) | |
| download | passion-f46e606cf483d5613dba1a9c02b08817fa4fec7e.tar.gz | |
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Change-Id: Ie7da363c5c2728b8af2dd01f75eddbfb530e2690
0 files changed, 0 insertions, 0 deletions