OSDN Git Service

Merge "Fix build"
authorRoboErik <epastern@google.com>
Thu, 1 May 2014 18:19:31 +0000 (18:19 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 1 May 2014 18:19:32 +0000 (18:19 +0000)

Trivial merge