| commit | b2ac59b3a1748eef58c228a7e808d40bd1741dcf | [log] [tgz] |
|---|---|---|
| author | Conley Owens <cco3@android.com> | Mon Jul 18 16:55:33 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 18 16:55:33 2011 -0700 |
| tree | 8136f77079960d466a895235d601d97d258a4f06 | |
| parent | 0ab6faaca562abcb1d116824198388f5a3c8c73d [diff] | |
| parent | e82c319beb2275ad0832cf77252943e16df04b1a [diff] |
am a4aef41a: am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16" * commit 'a4aef41a74a69b0296b88361ffb33d0470a26362': stagefright aacenc: Mark codeWord as UWord16