commit | a4aef41a74a69b0296b88361ffb33d0470a26362 | [log] [tgz] |
---|---|---|
author | Conley Owens <cco3@android.com> | Mon Jul 18 16:53:41 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 18 16:53:41 2011 -0700 |
tree | a876514d4675cf68488277d7d6038bf83353d49f | |
parent | 2acddc54e1e7a9f41b4b5acc2e8984c46539425a [diff] | |
parent | a74774fd9146aa22801487d3652dc18e9e328b8e [diff] |
am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16" * commit 'a74774fd9146aa22801487d3652dc18e9e328b8e': stagefright aacenc: Mark codeWord as UWord16