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:
799a29b
8033a03
)
[automerger skipped]Merge "Add NonNull Annotations To IpSec API Surface" into pi...
author
Nathan Harold
<nharold@google.com>
Thu, 22 Mar 2018 19:41:01 +0000
(19:41 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 22 Mar 2018 19:41:01 +0000
(19:41 +0000)
am:
8033a03f9c
-s ours
Change-Id: I85f74c4687a54243ccdf290c0a011745623fb040
Trivial merge