| commit | c1b753b09b188eebecb276afdf1e8ae07fc5086a | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Tue Feb 08 20:23:27 2011 -0800 |
| committer | Gilles Debunne <debunne@google.com> | Tue Feb 08 20:36:04 2011 -0800 |
| tree | ea8394774dd2af9d10699c0198d5639d47f212a6 | |
| parent | 9b587ca015defee16bb9acbf92eacdc3f513dbc8 [diff] | |
| parent | a8b288d28588db5a850fede719c8cbfcf7b8966d [diff] |
resolved conflicts for merge of e04c1496 to honeycomb-plus-aosp Change-Id: I59886953b76857ab0a089947e1c5335b93f68d5e