OSDN Git Service

Merge "Fix build breakage"
authorRubin Xu <rubinxu@google.com>
Wed, 27 Jan 2016 01:31:43 +0000 (01:31 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 27 Jan 2016 01:31:43 +0000 (01:31 +0000)

Trivial merge