OSDN Git Service

Merge "Update override config to include some changes from global config" into nyc-dev
authorAndrii Kulian <akulian@google.com>
Wed, 1 Jun 2016 01:08:36 +0000 (01:08 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 1 Jun 2016 01:08:37 +0000 (01:08 +0000)

Trivial merge