OSDN Git Service

Merge "Merge "Merge changes from topic 'update-conscrypt' am: c497348c74" into stage...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 5 May 2017 21:42:54 +0000 (21:42 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 5 May 2017 21:42:58 +0000 (21:42 +0000)
commitaf3b2ffa3d89c6ce75eae5ee5712f725df53a9e6
treee0de0e34400d706654f43a436bef73bb5ccdb751
parent0f75698035ecc0b3e23e39143248ff7c0fdba2b8
parenta5170da8be5c557651f811f3bbe9356f97412713
Merge "Merge "Merge changes from topic 'update-conscrypt' am: c497348c74" into stage-aosp-master am: da0363104c am: 56014efbfd" into oc-dev-plus-aosp