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)
commitdc5ac96ccfb3539f5a1b0ffb54b3e157dcf124f3
treef5851353c6b784caf2fd9ba80438343156a11517
parente3168307bcd1c827c0d3ba15961aa1c9990cbe11
parent215a16e46cab022e9a1525290fe99f12a99d5611
Merge cherrypicks of [37837283783729] into oc-m4-release

Change-Id: I9e1c316fea8f2bdf18fb8ad0bb38f5c4d6485fe7