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:33:07 +0000 (20:33 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 10 Aug 2018 20:33:07 +0000 (20:33 +0000)
Change-Id: I77b8558b6721f516ae7042b60155ef2eca6ff3b5


Trivial merge