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:
9172df0
da03631
)
Merge "Merge changes from topic 'update-conscrypt' am: c497348c74" into stage-aosp...
author
Kenny Root
<kroot@google.com>
Fri, 5 May 2017 21:25:56 +0000
(21:25 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 5 May 2017 21:25:56 +0000
(21:25 +0000)
am:
da0363104c
Change-Id: I2fd2dc2d580de6423111de1674b3999d87542878
Trivial merge