OSDN Git Service

Merge cherrypicks of [4741663, 4741664, 4741665, 4741666, 4743080, 4743081, 4743082...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 10 Aug 2018 20:32:14 +0000 (20:32 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 10 Aug 2018 20:32:14 +0000 (20:32 +0000)
Change-Id: Iead43bb0deac18379a0a05dff4cadc3a86e59d1b


Trivial merge