OSDN Git Service

Merge cherrypicks of [3783728, 3783729] into oc-m4-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 22 Mar 2018 23:35:52 +0000 (23:35 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 22 Mar 2018 23:35:52 +0000 (23:35 +0000)
Change-Id: I9e1c316fea8f2bdf18fb8ad0bb38f5c4d6485fe7


Trivial merge