OSDN Git Service

resolve merge conflicts of 81fd991 to nyc-dev-plus-aosp
authorMattias Nissler <mnissler@google.com>
Wed, 13 Apr 2016 01:56:49 +0000 (01:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 13 Apr 2016 01:56:49 +0000 (01:56 +0000)
commit7634807192ccee6d5457f8cff6d6babbac11548a
treefefc98bb7b73f0f992f912ef47583961c88c2399
parent6a127c09a8cfdc7a3c90f3a8ace33a89ac7c9286
parentccd9dd53f8a55b296eb0671acefc9f0163fd83b4
resolve merge conflicts of 81fd991 to nyc-dev-plus-aosp
am: ccd9dd5

* commit 'ccd9dd53f8a55b296eb0671acefc9f0163fd83b4':
  Switch to BoringSSL crypto.

Change-Id: Icc997e054801181ab99cbd9a77cd209b93ec9cd3