OSDN Git Service

Merge "Fix build breakage"
authorRaph Levien <raph@google.com>
Thu, 26 Jun 2014 16:07:55 +0000 (16:07 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 26 Jun 2014 08:19:24 +0000 (08:19 +0000)

Trivial merge