OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a3fbb3b 7884a63)
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)
am: 7884a63731

* commit '7884a63731a876f483c13288c87d8e7af7a533e4':
  Make signapk use Conscrypt.

1  2 
core/Makefile patch | diff1 | diff2 | blob | history

diff --cc core/Makefile
Simple merge
build
About OSDN
Find Software
Develop Software
Help