OSDN Git Service

Merge cherrypicks of [2879627, 2879649, 2879442, 2880524, 2879650] into oc-mr1-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Mon, 11 Sep 2017 23:06:23 +0000 (23:06 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Mon, 11 Sep 2017 23:06:23 +0000 (23:06 +0000)
Change-Id: I4324d723c875df1c71a32bfa20860558c43f0169


Trivial merge