OSDN Git Service

Merge changes from topic 'revert-update-conscrypt' into oc-dr1-dev am: b2b73e4956
authorTobias Thierer <tobiast@google.com>
Mon, 3 Jul 2017 15:30:44 +0000 (15:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 3 Jul 2017 15:30:44 +0000 (15:30 +0000)
commitd765cfbd2793f92b87b93285ef9b5b45f3035cd6
tree5b293bfae1a131074eec9d81cd81be4f0ecad5dc
parent927d9580a724c57d1f3ab9d6502f23460c5b099b
parent18318f7dbf9321a440e985bafada74fe35b5e4f2
Merge changes from topic 'revert-update-conscrypt' into oc-dr1-dev am: b2b73e4956
am: 18318f7dbf

Change-Id: Id2bea1ccb2a3f6523e2e21da32e2adf7ca1810a7