OSDN Git Service

Merge "Make signapk use Conscrypt." am: 7884a63731
authorAlex Klyubin <klyubin@google.com>
Fri, 11 Dec 2015 18:47:26 +0000 (10:47 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 Dec 2015 18:47:26 +0000 (10:47 -0800)
commitc1b31821ef6433ca47850bfdd1743e57f735050e
tree97a08bc911073876b1bf55795d6f1033cf96ae22
parentc0b23c47806803a3e7934c725b8b7941670be9e7
parentdfd2199ef66dcc162a0165f9a34652ae2877538d
Merge "Make signapk use Conscrypt." am: 7884a63731
am: dfd2199ef6

* commit 'dfd2199ef66dcc162a0165f9a34652ae2877538d':
  Make signapk use Conscrypt.
core/Makefile
core/config.mk
core/definitions.mk