OSDN Git Service

Merge "Fix the build"
authorRomain Guy <romainguy@google.com>
Fri, 22 Jul 2011 23:46:59 +0000 (16:46 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 22 Jul 2011 23:46:59 +0000 (16:46 -0700)

Trivial merge