OSDN Git Service

Merge cherrypicks of [3817648] into pi-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 29 Mar 2018 20:59:09 +0000 (20:59 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 29 Mar 2018 20:59:09 +0000 (20:59 +0000)
Change-Id: I869e8a8da4aee1cd68b6e6a328c7b8c503293740


Trivial merge