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:
b9dbd76
b077f6a
)
Merge changes from topic 'ipsec-svc-pick' into oc-dev
author
Nathan Harold
<nharold@google.com>
Thu, 6 Apr 2017 01:56:16 +0000
(
01:56
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 6 Apr 2017 01:56:16 +0000
(
01:56
+0000)
am:
b077f6abd3
-s ours
Change-Id: Iea4a23356643415390322a53a547f7194bb2cafa
Trivial merge