OSDN Git Service

Merge "Fix build part 2" into jb-mr1-dev
authorAmith Yamasani <yamasani@google.com>
Sat, 18 Aug 2012 00:08:33 +0000 (17:08 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 18 Aug 2012 00:08:33 +0000 (17:08 -0700)

Trivial merge