| commit | e90cc3ba6c6ccd383f31b539367c2cccea278fed | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Oct 11 14:44:10 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Oct 11 14:44:10 2010 -0700 |
| tree | c5e43b158779f49d8b5d108274e707ce4ca0a5c3 | |
| parent | 700889f504ef134ab307d95b6bfbbb426ea730e3 [diff] | |
| parent | 35e79e32808456a7f5f21126ed2fa7badf8dc0bc [diff] |
resolved conflicts for merge of 35e79e32 to gingerbread-plus-aosp Change-Id: I039355b9d5852436c8352efc5a85590e5f2bc080