OSDN Git Service

Merge cherrypicks of [3050203] into oc-m2-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Wed, 11 Oct 2017 18:01:03 +0000 (18:01 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Wed, 11 Oct 2017 18:01:03 +0000 (18:01 +0000)
Change-Id: Ib6ede87bcbc50cdeb79eeaf5fc6d06cf95b9a23b


Trivial merge