commit | 4dac1c4e109430de6e55344a8898b3e0c06ff824 | [log] [tgz] |
---|---|---|
author | Conley Owens <cco3@android.com> | Mon Jul 18 16:57:04 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 18 16:57:04 2011 -0700 |
tree | fa13c7779a720a6f160738e00be4f9c8a51c7b79 | |
parent | 6776d1911dd382e012a1aa6593c149bed3d13099 [diff] | |
parent | 83937f38f0ea0d22b3a8ac61960fe87eb419f6c9 [diff] |
am e5143d6c: am a4aef41a: am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16" * commit 'e5143d6c09f0e9a960661a2b0a5916c33fcafc4d': stagefright aacenc: Mark codeWord as UWord16