| commit | 9fd12cfb5667c2745df6c6fe5ae7d07a1ff5ab9e | [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 | 3cc74e4489daab49d53f4ad0b64b8fdcc7ac6f61 | |
| parent | c27cc947e42b1effb5f6d18e0d6a8a1055f271d9 [diff] | |
| parent | e5143d6c09f0e9a960661a2b0a5916c33fcafc4d [diff] |
am e5143d6c: am a4aef41a: am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16" * commit 'e5143d6c09f0e9a960661a2b0a5916c33fcafc4d': stagefright aacenc: Mark codeWord as UWord16