OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4b1d4a7
605aac1
)
am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
author
Deckard Autoverifier
<deckard@android.com>
Mon, 18 Jul 2011 22:38:22 +0000
(15:38 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 18 Jul 2011 22:38:22 +0000
(15:38 -0700)
* commit '
55f115a3214343c826acf27fcbc4bf2927049083
':
stagefright: Only use __int64 on MSVC, not on all win32 compilers
Trivial merge