OSDN Git Service

Merge cherrypicks of [2429785, 2429786] into oc-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Mon, 19 Jun 2017 22:55:44 +0000 (22:55 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Mon, 19 Jun 2017 22:55:44 +0000 (22:55 +0000)
commit563d72c2b6c40337bf9e01fc058f5c239b7f52e9
tree371244116df1a2a3eda3218febcb38108697976d
parent5c3f97a391d077ed8f6a528574f07aaacea880a0
parent481bfd18e0fabc4fffbfb5c776d31928cf7e5380
Merge cherrypicks of [24297852429786] into oc-release

Change-Id: Ibc8b0ff54a0bf3de6a54863431d1437014bc8b47