OSDN Git Service

Merge cherrypicks of [3089203, 3089096] into oc-m2-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Wed, 18 Oct 2017 17:19:57 +0000 (17:19 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Wed, 18 Oct 2017 17:19:57 +0000 (17:19 +0000)
commit472c215a94abdbdd38515c2d84c419053a2a4e26
treea1af135e40378041343db90d176cdbd343b37106
parent2b14c27722de1c69ef962da9ceda96792818787c
parent94ebb3472c878d802311506dc01febb90f5496c5
Merge cherrypicks of [30892033089096] into oc-m2-release

Change-Id: I17c0b1688c7df6be6d3235c911bde1813add70ad