| commit | dc365a36dac50bccc1411c37839513daec56d335 | [log] [tgz] |
|---|---|---|
| author | Svetoslav Ganov <svetoslavganov@google.com> | Fri Feb 25 12:40:57 2011 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Feb 25 12:40:57 2011 -0800 |
| tree | 1d9283223c2883e4eee52bd82a3bb3ad41b7ee54 | |
| parent | 040f61504aeab1d905ac9fb85945699877e78d4e [diff] | |
| parent | f114809031c5e5017bf69ab7a6d01024f1745fc8 [diff] |
Merge "resolved conflicts for merge of 66edf2bb to honeycomb-plus-aosp" into honeycomb-plus-aosp