| commit | 079e30cd2a09388ba9ad2149a66de86be4f3a7ac | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Mon Jun 06 16:29:34 2011 -0700 |
| committer | Marco Nelissen <marcone@google.com> | Mon Jun 06 16:29:34 2011 -0700 |
| tree | 1aff9e7f72cee28e70e2f02ee7b12ae807a02c69 | |
| parent | cfe26919abcd3c466f40b437d084311bf025d449 [diff] | |
| parent | 531bed610c363bae71ff3d7b360f7c9ce612693e [diff] |
resolved conflicts for merge of 531bed61 to honeycomb-plus-aosp Change-Id: I28154c6feb563712eeda3e1176d62c7d2a28eff8