| commit | a43fed707fcea14b3dd048ef9d9359fcb24b90bb | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Sep 10 09:53:43 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Sep 10 09:53:43 2010 -0700 |
| tree | 0093daf5a7f57d287324c566f7f93f7cf1e9f9cc | |
| parent | f3915937c4af4d5a10cb7c2429e4fd323b69a087 [diff] | |
| parent | 27ed8ad2db653f6ac07dcf8bcc05e2409c8bb024 [diff] |
resolved conflicts for merge of 56aa3c76 to gingerbread-plus-aosp Change-Id: I3d36a665f93f976824592edf35f6d6a205cc7617