OSDN Git Service

Merge "Fix jb build"
authorYahan Zhou <yahan@google.com>
Wed, 20 Jul 2016 23:26:20 +0000 (23:26 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 20 Jul 2016 23:26:20 +0000 (23:26 +0000)

Trivial merge