OSDN Git Service

Merge cherrypicks of [3310659, 3311062, 3310913, 3310647, 3310648, 3310649, 3310650...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Tue, 5 Dec 2017 01:14:37 +0000 (01:14 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Tue, 5 Dec 2017 01:14:37 +0000 (01:14 +0000)
commitd2e09ce0c6611da34f9c31437ed8c74448b75564
tree5174e9cbfa01a9673f490b9d3e25edda39a73854
parentb2d6cb880efc42a55c3a0a7b1af83600b7aa3298
parent13d46d74ad9387fe3d3048325dfe8ed8c929a1fd
Merge cherrypicks of [331065933110623310913331064733106483310649331065033106513311172331060133111093311193331121333112143311215331121633112173311218331121933112203311221331122233112233311063331122533112523311253331125433112553311256331125833112593311261331126233112633311264331126533112673311268331126933112703311271331131233113133311315331131733113203311322] into oc-m4-release

Change-Id: I367328f711b7c70352b6e4ddc2a6494fa20b3126