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:19 +0000 (18:51 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 19 Jan 2018 18:51:19 +0000 (18:51 +0000)
commitd03dbbd11f89b6f1f828636b9399190d663ba6bd
treef7584ce9f33a07ee6c7349e578e07ce235275d83
parent91c5f0c8db1856c53153957106cc4ee2c96f7f84
parentccc5e7d6d2a459d04dbb007268edc2b1d0e3e39d
Merge cherrypicks of [34841083483651] into oc-m2-release

Change-Id: Ied8deb31e77aadd4512fe896863f854566299434