OSDN Git Service

Merge "Fixing build"
authorAdam Cohen <adamcohen@google.com>
Mon, 4 Apr 2011 19:12:25 +0000 (12:12 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 4 Apr 2011 19:12:25 +0000 (12:12 -0700)

Trivial merge