| commit | 23820f6a8969f99722cb32d3ddf243d103af01a9 | [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 | ea8394774dd2af9d10699c0198d5639d47f212a6 | |
| parent | 11b5325535fd1b022c5140eb8de62d2a825c1acd [diff] | |
| parent | 4dffae17181e75a1acebd2bb7e138a8fdf51766a [diff] |
resolved conflicts for merge of 8e28ab22 to honeycomb-plus-aosp Change-Id: Ic590c75a6d4475cc0a35f1af8687a4ee8846f20b