| commit | 153cebee2432a931773130bffa20e72a982c0107 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Wed Feb 16 12:08:36 2011 -0800 |
| committer | Scott Main <smain@google.com> | Wed Feb 16 12:08:36 2011 -0800 |
| tree | d7cbc6889af07bf34cd74122f9fb77a584212e4d | |
| parent | 271397cfb2b79d1346568209b37b1f57707f924a [diff] | |
| parent | f722cecd182b909eae3dc6ec7f41900b53ba45c1 [diff] |
resolved conflicts for merge of f722cecd to honeycomb-plus-aosp Change-Id: Iaaa3a3a1231ea0e0b7ad7442cdf664418472f27f