OSDN Git Service

Merge cherrypicks of [2939596, 2938808] into oc-m2-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 21 Sep 2017 22:34:06 +0000 (22:34 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 21 Sep 2017 22:34:06 +0000 (22:34 +0000)
commit38f60ad604e3e4410e919a3ad38add1a418b7f82
treeff1225c7ea9c43cd03f6484d30dad8fb0f3acb15
parent87f83b83850fe36209f02a596585a9e9fb1e6b86
parent8d90ec50672d61d0b65570e16bfcb70db069ecf4
Merge cherrypicks of [29395962938808] into oc-m2-release

Change-Id: Ie81cd9463b8c5948d7b8df1f38621fb9a60335fd