OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ae39f8c
91a4bd9
)
Merge "lshal: Fix timeout causes unexpected exits." am: 057e74631b am: fdf61aa557
author
Yifan Hong
<elsk@google.com>
Wed, 22 Feb 2017 18:43:43 +0000
(18:43 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 22 Feb 2017 18:43:43 +0000
(18:43 +0000)
am:
91a4bd9cd2
Change-Id: I4663a64806ddb285e8bf5e9235759fee49bc8a93
Trivial merge