OSDN Git Service

Merge "Fix build"
authorJason Monk <jmonk@google.com>
Wed, 18 Nov 2015 15:41:27 +0000 (15:41 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 18 Nov 2015 15:41:27 +0000 (15:41 +0000)

Trivial merge