OSDN Git Service

Merge cherrypicks of [2973982, 2974657, 2974658, 2973983, 2973984, 2974689, 2974690...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 28 Sep 2017 17:17:11 +0000 (17:17 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 28 Sep 2017 17:17:11 +0000 (17:17 +0000)
Change-Id: I1343a6e044021a57cb32927982ac6a2582d330a1


Trivial merge