commit | c9448802a76a252e65c6527428b1b255e20d9241 | [log] [tgz] |
---|---|---|
author | Marco Nelissen <marcone@google.com> | Wed Oct 06 16:04:05 2010 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Oct 06 16:04:05 2010 -0700 |
tree | 972c2008e2aa83c812aa5884017051cadae4d360 | |
parent | 08cbad28185273dd6e97f78bcaff3b6fffbe5ed3 [diff] | |
parent | 47017b3b7ff8cfd3e85b698dfed947d5ee13dc79 [diff] |
Merge "froyo == honeycomb"