OSDN Git Service

Merge "Fix the red build." into oc-dr1-dev-plus-aosp
authorPankaj Kanwar <pkanwar@google.com>
Mon, 26 Jun 2017 18:30:11 +0000 (18:30 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 26 Jun 2017 18:30:18 +0000 (18:30 +0000)

Trivial merge