OSDN Git Service
(root)
/
android-x86
/
hardware-libhardware_legacy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
915e510
deb60d5
)
Use "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/26154276
author
Alex Cheung
<alexcheung@google.com>
Thu, 24 Dec 2015 00:40:53 +0000
(16:40 -0800)
committer
Alex Cheung
<alexcheung@google.com>
Thu, 24 Dec 2015 00:40:53 +0000
(16:40 -0800)
Trivial merge