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:
c4bb455
1ae41e2
)
am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
author
Deckard Autoverifier
<deckard@android.com>
Mon, 18 Jul 2011 22:38:25 +0000
(15:38 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 18 Jul 2011 22:38:25 +0000
(15:38 -0700)
* commit '
c06c3603e09a85136eb97d1d8ba1a49fcebae93b
':
stagefright aacenc: Make the mem_malloc function 64-bit safe
Trivial merge