OSDN Git Service

Merge "Fix broken build"
authorVladislav Kaznacheev <kaznacheev@google.com>
Wed, 18 Nov 2015 20:55:35 +0000 (20:55 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 18 Nov 2015 20:55:35 +0000 (20:55 +0000)

Trivial merge