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:
bf8329a
8a047a0
)
Merge "Add AppOp for IpSec Tunnels" into pi-dev
author
Nathan Harold
<nharold@google.com>
Thu, 22 Mar 2018 21:35:36 +0000
(21:35 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 22 Mar 2018 21:35:36 +0000
(21:35 +0000)
am:
8a047a0c52
Change-Id: I159d49219d2f75e1f5aeece4196638a8823fc029
Trivial merge