OSDN Git Service

am 9854afdc: (-s ours) am 97269982: Remove extraneous patch from secure connections...
authorAndre Eisenbach <eisenbach@google.com>
Thu, 27 Aug 2015 10:53:07 +0000 (10:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:53:07 +0000 (10:53 +0000)
commit99b1e396323114927b25919f7c7cff1d802cebe4
tree96a0cefd324d81915ec05e0e285dc2761b61558c
parent25f5a2b2ce6a7db011841f7e5c87c34c3ac2e5bd
parent9854afdc6ff5fc1034e664878ff2d17b1a9dabf4
am 9854afdc: (-s ours) am 97269982: Remove extraneous patch from secure connections workaround

* commit '9854afdc6ff5fc1034e664878ff2d17b1a9dabf4':