OSDN Git Service

Merge "fix the build"
authorMichael Jurka <mikejurka@google.com>
Sat, 4 Jun 2011 01:43:21 +0000 (18:43 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 4 Jun 2011 01:43:21 +0000 (18:43 -0700)

Trivial merge