commit | 497d910c85598a75cc2be2ea932c44036c854fc3 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Tue Sep 15 09:03:18 2009 -0700 |
committer | Jean-Baptiste Queru <jbq@google.com> | Tue Sep 15 09:03:18 2009 -0700 |
tree | 567e8ce139138e5d6bcb8f14e86dc3cb99a0df1e | |
parent | a3abe794b734382295b89d6c2d1d176ce4bb9b4b [diff] | |
parent | 5d8f37ad78fc66901af50c762029a501561f3b23 [diff] |
resolved conflicts for merge of 5d8f37ad to eclair-plus-aosp