OSDN Git Service

Merge "froyo == honeycomb"
authorMarco Nelissen <marcone@google.com>
Wed, 6 Oct 2010 23:04:05 +0000 (16:04 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 6 Oct 2010 23:04:05 +0000 (16:04 -0700)

Trivial merge