OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
19290e4
59410a9
)
Merge "Add libcrypto to shared libraries of core/jni" into oc-dev-plus-aosp am: c584a...
author
Adam Vartanian
<flooey@google.com>
Mon, 26 Jun 2017 10:18:46 +0000
(10:18 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 26 Jun 2017 10:18:46 +0000
(10:18 +0000)
am:
59410a96ed
-s ours
Change-Id: I883b87ddb6f5d8fb9ffdb31cab12fd4429ececd6
Trivial merge