OSDN Git Service

Merge "Fix build."
authorDianne Hackborn <hackbod@google.com>
Tue, 16 Aug 2011 02:22:25 +0000 (19:22 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 16 Aug 2011 02:22:25 +0000 (19:22 -0700)

Trivial merge