OSDN Git Service
(root)
/
android-x86
/
external-alsa-utils.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
82c0cfd
b55aebd
)
Merge remote-tracking branch 'cyanogenmod/gb-release-7.2' into jb-x86-monami
author
Masaki Muranaka
<monaka@monami-ya.jp>
Wed, 14 Aug 2013 18:13:22 +0000
(
03:13
+0900)
committer
Masaki Muranaka
<monaka@monami-ya.jp>
Wed, 14 Aug 2013 18:13:22 +0000
(
03:13
+0900)
Conflicts:
Android.mk
1
2
Android.mk
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Android.mk
Simple merge