tree 878c4e90777347008d08e624f81011a3c09acf7c
parent ecd32c786c1469e476b29d13c3a25663d593da62
parent 6e08bff22b6b9019c72422e1902201d7cb4397b5
author Elliott Hughes <enh@google.com> 1460658179 +0000
committer android-build-merger <android-build-merger@google.com> 1460658179 +0000

resolve merge conflicts of 8febafa to nyc-dev-plus-aosp
am: 6e08bff

* commit '6e08bff22b6b9019c72422e1902201d7cb4397b5':
  Use BoringSSL instead of mincrypt to speed up package verification.

Change-Id: I1fce90ecfa92369b767c2d3387dfe72dced4faad