OSDN Git Service

Merge cherrypicks of [5141855] into oc-m8-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 28 Sep 2018 23:14:06 +0000 (23:14 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 28 Sep 2018 23:14:06 +0000 (23:14 +0000)
Change-Id: I6cad0b3abf3d6310ad835765629eaa5fc57d2e2f


Trivial merge