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:
016e850
ef1fb48
)
Merge "Fix receive timeout on LocalSocket" am: 7a9c0cd854 am: 680ec020a1
author
Neil Fuller
<nfuller@google.com>
Wed, 31 Aug 2016 16:47:33 +0000
(16:47 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 31 Aug 2016 16:47:33 +0000
(16:47 +0000)
am:
ef1fb4889a
Change-Id: Ie4befe516f369d903a61f22aab15e40ac09193a3
Trivial merge