OSDN Git Service

Merge cherrypicks of [3116469, 3116470, 3116074, 3116075, 3116498, 3116499, 3117095...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Tue, 24 Oct 2017 06:12:34 +0000 (06:12 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Tue, 24 Oct 2017 06:12:34 +0000 (06:12 +0000)
Change-Id: I174cd31296e511ffd4498e7e6184821cee8099b8


Trivial merge