| commit | d8f9a83cab34de38981dc3ba5ca9df8dda02dbc0 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Wed Jun 15 08:33:09 2011 -0700 |
| committer | Marco Nelissen <marcone@google.com> | Wed Jun 15 08:58:38 2011 -0700 |
| tree | 72310f758560e816954288ec778751be26c45b6d | |
| parent | 653fd9cfacd15ddf9c482c46619ca9323da57726 [diff] | |
| parent | d027329cd6105c05c157e3858a170e4f04eb0e3e [diff] |
resolved conflicts for merge of d027329c to gingerbread-plus-aosp Change-Id: I169c415bf998b9935ab36812511573db05717b91