OSDN Git Service
(root)
/
android-x86
/
hardware-ril.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9101e51
6665064
)
resolved conflicts for merge of 66650640 to master
author
Andreas Gampe
<agampe@google.com>
Mon, 6 Apr 2015 23:22:37 +0000
(16:22 -0700)
committer
Andreas Gampe
<agampe@google.com>
Mon, 6 Apr 2015 23:22:37 +0000
(16:22 -0700)
Change-Id: I2ece30436199e695c0f2cd5963586a2279578b9b
Trivial merge