tree 571fa80724f0356932d702fc75376e126d5a8c6d
parent c2e63870e819ab2ba66c5e34e20996d3e32f7adf
parent 6e2a8b11ecb0bdfd6f4a2f096519075663a2d1c2
author Mattias Nissler <mnissler@google.com> 1460512157 +0000
committer android-build-merger <android-build-merger@google.com> 1460512157 +0000

resolve merge conflicts of 2bf95ac to nyc-dev-plus-aosp
am: 6e2a8b1

* commit '6e2a8b11ecb0bdfd6f4a2f096519075663a2d1c2':
  Convert recovery to use BoringSSL instead of mincrypt.

Change-Id: Ief6b279d1e7fd00af4e8153ac29212343493b293