OSDN Git Service

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

* commit '0264d8ff7c2d5a2cdb4faaf9a3493103138373dd':
  Don't start defaultcrypto twice

Change-Id: Ief95c3bf7798cf6090f68fb2eac124677d448187


Trivial merge