OSDN Git Service

Merge cherrypicks of [3484108, 3483651] into oc-m2-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 19 Jan 2018 18:51:21 +0000 (18:51 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 19 Jan 2018 18:51:21 +0000 (18:51 +0000)
commitb80cf4791b565518d849818d12d7b229afd23075
tree7e00135daed6e5412542817a00398473530ec649
parentfabc5670228ecf57f576be3f59b6b518d575dc74
parentce69272689d068f3cafdb65f166f2c9abbf43369
Merge cherrypicks of [34841083483651] into oc-m2-release

Change-Id: Ibeefb03c27e7f04dddd770533c2c8fd4ac52df0b