OSDN Git Service

Merge "Make signapk use Conscrypt."
authorAlex Klyubin <klyubin@google.com>
Fri, 11 Dec 2015 18:37:16 +0000 (10:37 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 Dec 2015 18:37:16 +0000 (10:37 -0800)
commitdfd2199ef66dcc162a0165f9a34652ae2877538d
tree8a677162644ec79d98e3601539cadf7977c6aba2
parenta3fbb3b0e49bfbec697f73d4c4e77bb12f8e348e
parent7884a63731a876f483c13288c87d8e7af7a533e4
Merge "Make signapk use Conscrypt."
am: 7884a63731

* commit '7884a63731a876f483c13288c87d8e7af7a533e4':
  Make signapk use Conscrypt.
core/Makefile