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:
89b9a33
6e5a42e
)
resolved conflicts for merge of 6e5a42e6 to lmp-dev-plus-aosp
author
Vince Harron
<vharron@google.com>
Fri, 15 Aug 2014 05:59:12 +0000
(22:59 -0700)
committer
Vince Harron
<vharron@google.com>
Fri, 15 Aug 2014 05:59:12 +0000
(22:59 -0700)
Change-Id: I118c05111ded541c8b4cf3c5533c5a3de3b89322
Trivial merge