OSDN Git Service

Merge cherrypicks of [3690002, 3691519, 3691668, 3690254, 3691428, 3690156] into...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Mon, 5 Mar 2018 22:15:00 +0000 (22:15 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Mon, 5 Mar 2018 22:15:00 +0000 (22:15 +0000)
Change-Id: I06da687582281eb9372058ac1a2d7a57ec747bf0


Trivial merge