OSDN Git Service

Merge "Fix build." into honeycomb
authorElliott Hughes <enh@google.com>
Thu, 13 Jan 2011 01:14:43 +0000 (17:14 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 13 Jan 2011 01:14:43 +0000 (17:14 -0800)

Trivial merge