OSDN Git Service

Merge "Back-port ag/2491664" into nyc-mr1-dev
authorPhil Weaver <pweaver@google.com>
Wed, 19 Jul 2017 00:46:35 +0000 (00:46 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 19 Jul 2017 00:46:35 +0000 (00:46 +0000)

Trivial merge