OSDN Git Service

Merge cherrypicks of [3310659, 3311062, 3310913, 3310647, 3310648, 3310649, 3310650...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Tue, 5 Dec 2017 01:14:37 +0000 (01:14 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Tue, 5 Dec 2017 01:14:37 +0000 (01:14 +0000)
Change-Id: I367328f711b7c70352b6e4ddc2a6494fa20b3126


Trivial merge