OSDN Git Service

Merge "Fix build"
authorJaesung Chung <jaesung@google.com>
Wed, 27 Jan 2016 16:28:31 +0000 (16:28 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 27 Jan 2016 16:28:31 +0000 (16:28 +0000)

Trivial merge