OSDN Git Service

Merge cherrypicks of [4036940, 4036941, 4036942, 4037115, 4037135] into pi-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 10 May 2018 14:53:46 +0000 (14:53 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 10 May 2018 14:53:46 +0000 (14:53 +0000)
Change-Id: I78d051f65b582f6ca8e5a9eb565a1c2d7d4a6705


Trivial merge