diff options
author | Elliott Hughes | 2016-04-14 13:22:59 -0500 |
---|---|---|
committer | android-build-merger | 2016-04-14 13:22:59 -0500 |
commit | 0ceef69073a639b52fd71c03bc2d6d593e5b7d02 (patch) | |
tree | 878c4e90777347008d08e624f81011a3c09acf7c /tools | |
parent | ecd32c786c1469e476b29d13c3a25663d593da62 (diff) | |
parent | 6e08bff22b6b9019c72422e1902201d7cb4397b5 (diff) | |
download | platform-bootable-recovery-0ceef69073a639b52fd71c03bc2d6d593e5b7d02.tar.gz platform-bootable-recovery-0ceef69073a639b52fd71c03bc2d6d593e5b7d02.tar.xz platform-bootable-recovery-0ceef69073a639b52fd71c03bc2d6d593e5b7d02.zip |
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
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions