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:
0f755fd
47c1875
)
Merge changes from topic 'lshal_debug' into oc-dev
author
Yifan Hong
<elsk@google.com>
Tue, 16 May 2017 16:12:56 +0000
(16:12 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 16 May 2017 16:12:56 +0000
(16:12 +0000)
am:
47c1875e35
-s ours
Change-Id: I66ecb116b5f601b08982ca82ab8aeda7e2c8a22e
Trivial merge