OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0e0891f
7a107b8
)
am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build
author
Marco Nelissen
<marcone@google.com>
Thu, 20 Mar 2014 20:18:07 +0000
(13:18 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 20 Mar 2014 20:18:07 +0000
(13:18 -0700)
* commit '
7a107b857e658ba11c0c1fd2325ac91a2c0569a2
':
Fix build
1
2
media/libstagefright/chromium_http/Android.mk
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
media/libstagefright/chromium_http/Android.mk
Simple merge