OSDN Git Service

Merge cherrypicks of [5313290, 5313323, 5313343, 5313415, 5313291, 5313441, 5313557...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 19 Oct 2018 16:33:45 +0000 (16:33 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 19 Oct 2018 16:33:45 +0000 (16:33 +0000)
Change-Id: I62e39466baf7cbb474eb521994e39f55b1fd3205


Trivial merge