OSDN Git Service

Merge "Implement CACert queries in SecurityController" into oc-dev
authorPhilipp Weiß <phweiss@google.com>
Wed, 10 May 2017 15:22:07 +0000 (15:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 10 May 2017 15:22:07 +0000 (15:22 +0000)
commit47d13239c08648dce6b07b2c0034da429bed5779
treed7210cd12452f730fc99624177917e476e1874b2
parent537ece988ae0e854f716266fe3dc117f2888bf08
parent4c78ac9ce45bc49bb19cec822fdd33df4e7bcde8
Merge "Implement CACert queries in SecurityController" into oc-dev
am: 4c78ac9ce4

Change-Id: Ic4a8e36b7f14ad8ebb2b23e76ef6c38f1bc1da72