OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
89bac18
4d8f6a3
)
am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"
author
Conley Owens
<cco3@android.com>
Mon, 18 Jul 2011 23:52:26 +0000
(16:52 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 18 Jul 2011 23:52:26 +0000
(16:52 -0700)
* commit '
4d8f6a38e7268e29e189cb4173f42c7aa5b320a3
':
stagefright aacenc: Mark codeWord as UWord16
Trivial merge