OSDN Git Service

Merge cherrypicks of [2978126, 2977997, 2977757, 2977846, 2977998, 2978351, 2978352...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 29 Sep 2017 01:01:17 +0000 (01:01 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 29 Sep 2017 01:01:17 +0000 (01:01 +0000)
Change-Id: Idb61f88cdf0bdfc8f611c6f3a63f2a7e4b6c8c2c


Trivial merge