| commit | 005f783fa0d24f98e39c7fcc34365046dd14d852 | [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 | 2de34eaf949bd30904e7e7343a64fce86fec4561 | |
| parent | 68ca4d3c97c5db2b5703ecc81e1ec076263c2e39 [diff] | |
| parent | 7788d44a5ea26de477efe664235f6a82a485e144 [diff] |
Merge "resolved conflicts for merge of 66edf2bb to honeycomb-plus-aosp" into honeycomb-plus-aosp