OSDN Git Service

Merge "Fix build"
authorJorim Jaggi <jjaggi@google.com>
Sat, 16 Jan 2016 00:21:18 +0000 (00:21 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 16 Jan 2016 00:21:18 +0000 (00:21 +0000)

Trivial merge