OSDN Git Service

Merge changes from topic 'revert-update-conscrypt' into oc-dr1-dev
authorTobias Thierer <tobiast@google.com>
Mon, 3 Jul 2017 15:21:03 +0000 (15:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 3 Jul 2017 15:21:03 +0000 (15:21 +0000)
commit18318f7dbf9321a440e985bafada74fe35b5e4f2
tree77439a066e8660857962acd2c0a4b900c4557887
parent216a0bdfb8ef365a976093a1fc4718737b28427d
parentb2b73e4956fa2ffebc80893b68f37989a631eca1
Merge changes from topic 'revert-update-conscrypt' into oc-dr1-dev
am: b2b73e4956

Change-Id: I7b97fd34f5007f52804c45e539f493184bcf8c0d