| commit | e82c319beb2275ad0832cf77252943e16df04b1a | [log] [tgz] |
|---|---|---|
| author | Conley Owens <cco3@android.com> | Mon Jul 18 16:52:26 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 18 16:52:26 2011 -0700 |
| tree | 883e55246aee2ad0ad312023a8e6b8b68b4e0587 | |
| parent | 6f1dd23b28752fdf47795c6575c537943711b1c1 [diff] | |
| parent | d94bb8b524e09f978b6a16699b968628ff279208 [diff] |
am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16" * commit '4d8f6a38e7268e29e189cb4173f42c7aa5b320a3': stagefright aacenc: Mark codeWord as UWord16