OSDN Git Service

Merge "Don\'t start defaultcrypto twice" into nyc-dev am: 0264d8f
authorPaul Lawrence <paullawrence@google.com>
Tue, 19 Apr 2016 14:50:07 +0000 (14:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 19 Apr 2016 14:50:07 +0000 (14:50 +0000)
commit85dfdb082d87e2e17e69cc74d5b773959b15645c
treeb61bd2c1ff09e3b02e5ad44f8dbd7f098da613bf
parente34f078ab1c39048851c339224bf5af01c2ebada
parente72c33872e2105ca1e63ba4f891ac68a6330dffa
Merge "Don\'t start defaultcrypto twice" into nyc-dev am: 0264d8f
am: e72c338

* commit 'e72c33872e2105ca1e63ba4f891ac68a6330dffa':
  Don't start defaultcrypto twice

Change-Id: Ibad904c5df684b03b80771a6a90c6a1ee49e073f