| commit | a8b94925abb022d6ae4f897852a16d7dc680e636 | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Tue Feb 08 20:23:27 2011 -0800 |
| committer | Gilles Debunne <debunne@google.com> | Tue Feb 08 20:36:04 2011 -0800 |
| tree | bc3c6a042d6cb6faf527ecde50b454fafe411b77 | |
| parent | 9087566bf1d6b2b7d7a0d3112732113400f6ec47 [diff] | |
| parent | e04c14962f4a1089d411e1f7fa4d1019fe723885 [diff] |
resolved conflicts for merge of e04c1496 to honeycomb-plus-aosp Change-Id: I59886953b76857ab0a089947e1c5335b93f68d5e