OSDN Git Service

Merge "Fix build."
authorJeff Brown <jeffbrown@google.com>
Thu, 18 Jul 2013 23:38:40 +0000 (23:38 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 18 Jul 2013 23:38:41 +0000 (23:38 +0000)

Trivial merge