| commit | aff2cfd14b3d37a22b2d6b1ba72b52c6a80a12b3 | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Thu Feb 10 14:43:35 2011 -0800 |
| committer | Gilles Debunne <debunne@google.com> | Thu Feb 10 14:43:35 2011 -0800 |
| tree | b7566f705d124f1602022ec5a4bde5a6568e2b3d | |
| parent | 48fe5c3a86435a401fa88b43e15b84e29e660173 [diff] | |
| parent | 8e28ab22de4eb246114f32856ec8a46ae4a0e1cc [diff] |
resolved conflicts for merge of 8e28ab22 to honeycomb-plus-aosp Change-Id: Ic590c75a6d4475cc0a35f1af8687a4ee8846f20b