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:
6c6dcce
b318f8a
)
Merge "Temporarily disable InetDiagSocketTest." am: 5f2ae0dfbd
author
Lorenzo Colitti
<lorenzo@google.com>
Thu, 4 Apr 2019 04:20:34 +0000
(21:20 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 4 Apr 2019 04:20:34 +0000
(21:20 -0700)
am:
b318f8a490
Change-Id: I641da63d15ffbe6d5d2c8f39aeb39cb0a253899f
Trivial merge