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:39 +0000 (17:19 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Wed, 18 Oct 2017 17:19:39 +0000 (17:19 +0000)
commit174b188d4a5a977ab8edfc74ca43203ee5d3d681
tree73fa38835d4857021abd43c784ec1490112ee581
parenta0d70baafd6dcaf751202756a694c591a83614be
parenta1442ce6906aecd4056924feea0e804fc941d0ca
Merge cherrypicks of [30892033089096] into oc-m2-release

Change-Id: I9e73f762959592435a556ffc0a2da8b37b0275ac