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 | ecfd828657b8d31282b24d8fe748369e0e24a4c5 (patch) | |
| tree | a1ff72973f570d69c5a29ce728582e21fbeaf6c3 | |
| parent | 4685133cb91ebae32696905ee4c48a5e29e80f30 (diff) | |
| parent | d5b54b96ec135effef9d788b5a46e72ef5b474fa (diff) | |
| download | passion-common-ecfd828657b8d31282b24d8fe748369e0e24a4c5.tar.gz | |
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Change-Id: I7a48eda65c6d554890c608c08dfcfeeab638188b
0 files changed, 0 insertions, 0 deletions