| commit | 09f672509b78344258f1b0d9f021d2ec99942515 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Aug 17 15:24:11 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Tue Aug 17 15:24:11 2010 -0700 |
| tree | 7fd66b4182c74deb12a008d08c20e8c15d770d68 | |
| parent | 96e24634c6db1a87285ca78d529dcc318653b7e9 [diff] | |
| parent | 0b7bd95d69763573b87f95d4e9cab7d7358e9b93 [diff] |
resolved conflicts for merge of 0b7bd95d to gingerbread-plus-aosp Change-Id: I55c1689c7d0737c943efec28d8164d6a5360621c