OSDN Git Service

Merge "Fix build."
authorLorenzo Colitti <lorenzo@google.com>
Wed, 14 May 2014 12:46:03 +0000 (12:46 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 14 May 2014 12:46:07 +0000 (12:46 +0000)

Trivial merge