OSDN Git Service

Merge cherrypicks of [5610460, 5610582, 5610249, 5610250, 5610113, 5610163, 5610980...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Mon, 26 Nov 2018 17:21:00 +0000 (17:21 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Mon, 26 Nov 2018 17:21:00 +0000 (17:21 +0000)
Change-Id: I1404e0a821b4c44bd5a924a6e10dc3928672437f


Trivial merge