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:
c809744
47d1323
)
Merge "Implement CACert queries in SecurityController" into oc-dev am: 4c78ac9ce4
author
Philipp Weiß
<phweiss@google.com>
Wed, 10 May 2017 16:08:04 +0000
(16:08 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 10 May 2017 16:08:04 +0000
(16:08 +0000)
am:
47d13239c0
-s ours
Change-Id: I764b6a343522c6eceadc79182546e55d6eee9e45
Trivial merge