OSDN Git Service

Merge cherrypicks of [3502352, 3501378, 3502262, 3503730, 3502234] into pi-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Wed, 24 Jan 2018 02:55:09 +0000 (02:55 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Wed, 24 Jan 2018 02:55:09 +0000 (02:55 +0000)
Change-Id: I10ab24200916df17461e51ed80d1a19ce0f0c5f1


Trivial merge