| commit | f114809031c5e5017bf69ab7a6d01024f1745fc8 | [log] [tgz] |
|---|---|---|
| author | Svetoslav Ganov <svetoslavganov@google.com> | Fri Feb 25 12:39:59 2011 -0800 |
| committer | Svetoslav Ganov <svetoslavganov@google.com> | Fri Feb 25 12:39:59 2011 -0800 |
| tree | 2485f6f98313149bd200731ae555f7e8902c6b3c | |
| parent | 09979bcf730e7df033ab0d8cadf564873c7e624b [diff] | |
| parent | 66edf2bb3ffc6e03d942cdc94f1ca2daf5e64167 [diff] |
resolved conflicts for merge of 66edf2bb to honeycomb-plus-aosp Change-Id: I687ca9b7873890e3b30da16d5dde6b57ce92f0d6