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:
c2c84e9
60f8195
)
am a4aef41a: am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as...
author
Conley Owens
<cco3@android.com>
Mon, 18 Jul 2011 23:55:33 +0000
(16:55 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 18 Jul 2011 23:55:33 +0000
(16:55 -0700)
* commit '
a4aef41a74a69b0296b88361ffb33d0470a26362
':
stagefright aacenc: Mark codeWord as UWord16
Trivial merge